diff --git a/raystack/frontier/v1beta1/admin.proto b/raystack/frontier/v1beta1/admin.proto
index c0455eb2..bafccc26 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 SearchOrganizationTokens(SearchOrganizationTokensRequest) returns (SearchOrganizationTokensResponse) {}
-
   rpc SearchOrganizationServiceUserCredentials(SearchOrganizationServiceUserCredentialsRequest) returns (SearchOrganizationServiceUserCredentialsResponse) {}
 
   rpc SearchOrganizationServiceUsers(SearchOrganizationServiceUsersRequest) returns (SearchOrganizationServiceUsersResponse) {}
@@ -795,28 +793,6 @@ message SearchProjectUsersResponse {
   RQLQueryGroupResponse group = 3;
 }
 
-message SearchOrganizationTokensRequest {
-  string id = 1 [(buf.validate.field).string.min_len = 3];
-  RQLRequest query = 2;
-}
-
-message SearchOrganizationTokensResponse {
-  message OrganizationToken {
-    int64 amount = 1;
-    string type = 2;
-    string description = 3;
-    string user_id = 4;
-    string user_title = 5;
-    string user_avatar = 6;
-    google.protobuf.Timestamp created_at = 7;
-    string org_id = 8;
-  }
-
-  repeated OrganizationToken organization_tokens = 1;
-  RQLQueryPaginationResponse pagination = 2;
-  RQLQueryGroupResponse group = 3;
-}
-
 message ExportOrganizationTokensRequest {
   string id = 1 [(buf.validate.field).string.min_len = 3];
 }
diff --git a/raystack/frontier/v1beta1/frontier.proto b/raystack/frontier/v1beta1/frontier.proto
index 9c473243..168c90ad 100644
--- a/raystack/frontier/v1beta1/frontier.proto
+++ b/raystack/frontier/v1beta1/frontier.proto
@@ -363,6 +363,7 @@ service FrontierService {
   rpc CreateBillingUsage(CreateBillingUsageRequest) returns (CreateBillingUsageResponse) {}
 
   rpc ListBillingTransactions(ListBillingTransactionsRequest) returns (ListBillingTransactionsResponse) {}
+  rpc SearchOrganizationTokens(SearchOrganizationTokensRequest) returns (SearchOrganizationTokensResponse) {}
 
   rpc TotalDebitedTransactions(TotalDebitedTransactionsRequest) returns (TotalDebitedTransactionsResponse) {}
 
@@ -568,6 +569,28 @@ message TotalDebitedTransactionsResponse {
   BillingAccount.Balance debited = 1;
 }
 
+message SearchOrganizationTokensRequest {
+  string id = 1 [(buf.validate.field).string.min_len = 3];
+  RQLRequest query = 2;
+}
+
+message SearchOrganizationTokensResponse {
+  message OrganizationToken {
+    int64 amount = 1;
+    string type = 2;
+    string description = 3;
+    string user_id = 4;
+    string user_title = 5;
+    string user_avatar = 6;
+    google.protobuf.Timestamp created_at = 7;
+    string org_id = 8;
+  }
+
+  repeated OrganizationToken organization_tokens = 1;
+  RQLQueryPaginationResponse pagination = 2;
+  RQLQueryGroupResponse group = 3;
+}
+
 message GetSubscriptionRequest {
   reserved 1, 2;