diff --git a/raystack/frontier/v1beta1/admin.proto b/raystack/frontier/v1beta1/admin.proto
index 8edecd93..c0455eb2 100644
--- a/raystack/frontier/v1beta1/admin.proto
+++ b/raystack/frontier/v1beta1/admin.proto
@@ -37,8 +37,6 @@ service AdminService {
 
   rpc SearchOrganizationProjects(SearchOrganizationProjectsRequest) returns (SearchOrganizationProjectsResponse) {}
 
-  rpc SearchOrganizationInvoices(SearchOrganizationInvoicesRequest) returns (SearchOrganizationInvoicesResponse) {}
-
   rpc SearchOrganizationTokens(SearchOrganizationTokensRequest) returns (SearchOrganizationTokensResponse) {}
 
   rpc SearchOrganizationServiceUserCredentials(SearchOrganizationServiceUserCredentialsRequest) returns (SearchOrganizationServiceUserCredentialsResponse) {}
@@ -797,27 +795,6 @@ message SearchProjectUsersResponse {
   RQLQueryGroupResponse group = 3;
 }
 
-message SearchOrganizationInvoicesRequest {
-  string id = 1 [(buf.validate.field).string.min_len = 3];
-  RQLRequest query = 2;
-}
-
-message SearchOrganizationInvoicesResponse {
-  message OrganizationInvoice {
-    string id = 1;
-    int64 amount = 2;
-    string currency = 3;
-    string state = 4;
-    string invoice_link = 5;
-    google.protobuf.Timestamp created_at = 6;
-    string org_id = 7;
-  }
-
-  repeated OrganizationInvoice organization_invoices = 1;
-  RQLQueryPaginationResponse pagination = 2;
-  RQLQueryGroupResponse group = 3;
-}
-
 message SearchOrganizationTokensRequest {
   string id = 1 [(buf.validate.field).string.min_len = 3];
   RQLRequest query = 2;
diff --git a/raystack/frontier/v1beta1/frontier.proto b/raystack/frontier/v1beta1/frontier.proto
index 6229b588..34ca8094 100644
--- a/raystack/frontier/v1beta1/frontier.proto
+++ b/raystack/frontier/v1beta1/frontier.proto
@@ -370,7 +370,7 @@ service FrontierService {
 
   // Invoice
   rpc ListInvoices(ListInvoicesRequest) returns (ListInvoicesResponse) {}
-  rpc SearchOrganisationInvoices(SearchOrganisationInvoicesRequest) returns (SearchOrganisationInvoicesResponse) {}
+  rpc SearchOrganizationInvoices(SearchOrganizationInvoicesRequest) returns (SearchOrganizationInvoicesResponse) {}
 
   rpc GetUpcomingInvoice(GetUpcomingInvoiceRequest) returns (GetUpcomingInvoiceResponse) {}
 
@@ -909,14 +909,25 @@ message ListInvoicesResponse {
   repeated Invoice invoices = 1;
 }
 
-message SearchOrganisationInvoicesRequest {
-  string org_id = 1 [(buf.validate.field).string.min_len = 3];
+message SearchOrganizationInvoicesRequest {
+  string id = 1 [(buf.validate.field).string.min_len = 3];
   RQLRequest query = 2;
 }
 
-message SearchOrganisationInvoicesResponse {
-  repeated Invoice invoices = 1;
+message SearchOrganizationInvoicesResponse {
+  message OrganizationInvoice {
+    string id = 1;
+    int64 amount = 2;
+    string currency = 3;
+    string state = 4;
+    string invoice_link = 5;
+    google.protobuf.Timestamp created_at = 6;
+    string org_id = 7;
+  }
+
+  repeated OrganizationInvoice organization_invoices = 1;
   RQLQueryPaginationResponse pagination = 2;
+  RQLQueryGroupResponse group = 3;
 }
 
 message GetUpcomingInvoiceRequest {