diff --git a/gql-queries-generator/doc/queries.graphql b/gql-queries-generator/doc/queries.graphql
index 2492cf8b8..80f53a71e 100644
--- a/gql-queries-generator/doc/queries.graphql
+++ b/gql-queries-generator/doc/queries.graphql
@@ -6482,6 +6482,22 @@ query authCli_getRemoteLogin($loginId: String!, $secret: String!) {
   }
 }
 
+query authCli_listAccountClusters($pagination: CursorPaginationIn) {
+  infra_listBYOKClusters(pagination: $pagination) {
+    edges {
+      node {
+        clusterToken
+        displayName
+        id
+        metadata {
+          name
+          labels
+        }
+      }
+    }
+  }
+}
+
 mutation authCli_createClusterReference($cluster: BYOKClusterIn!) {
   infra_createBYOKCluster(cluster: $cluster) {
     id
@@ -6626,25 +6642,6 @@ query authCli_listImportedManagedResources($envName: String!, $search: SearchImp
   }
 }
 
-query authCli_listByokClusters($search: SearchCluster, $pagination: CursorPaginationIn) {
-  infra_listBYOKClusters(search: $search, pagination: $pagination) {
-    edges {
-      cursor
-      node {
-        clusterToken
-        displayName
-        id
-        metadata {
-          name
-          namespace
-        }
-        updateTime
-      }
-    }
-    totalCount
-  }
-}
-
 mutation authSetRemoteAuthHeader($loginId: String!, $authHeader: String) {
   auth_setRemoteAuthHeader(loginId: $loginId, authHeader: $authHeader)
 }
diff --git a/src/apps/auth/server/gql/cli-queries.ts b/src/apps/auth/server/gql/cli-queries.ts
index a8f77899c..970a20bfa 100644
--- a/src/apps/auth/server/gql/cli-queries.ts
+++ b/src/apps/auth/server/gql/cli-queries.ts
@@ -717,6 +717,29 @@ export const cliQueries = (executor: IExecutor) => ({
       vars: (_: any) => {},
     }
   ),
+  cli_listAccountClusters: executor(
+    gql`
+      query Infra_listBYOKClusters($pagination: CursorPaginationIn) {
+        infra_listBYOKClusters(pagination: $pagination) {
+          edges {
+            node {
+              clusterToken
+              displayName
+              id
+              metadata {
+                name
+                labels
+              }
+            }
+          }
+        }
+      }
+    `,
+    {
+      transformer: (data: any) => data.infra_listBYOKClusters,
+      vars(_: any) {},
+    }
+  ),
   cli_createClusterReference: executor(
     gql`
       mutation Infra_createBYOKCluster($cluster: BYOKClusterIn!) {
@@ -905,35 +928,4 @@ export const cliQueries = (executor: IExecutor) => ({
       vars(_: any) {},
     }
   ),
-  cli_listByokClusters: executor(
-    gql`
-      query Infra_listBYOKClusters(
-        $search: SearchCluster
-        $pagination: CursorPaginationIn
-      ) {
-        infra_listBYOKClusters(search: $search, pagination: $pagination) {
-          edges {
-            cursor
-            node {
-              clusterToken
-              displayName
-              id
-              metadata {
-                name
-                namespace
-              }
-              updateTime
-            }
-          }
-          totalCount
-        }
-      }
-    `,
-    {
-      transformer: (data: any) => {
-        return data.infra_listBYOKClusters;
-      },
-      vars(_: any) {},
-    }
-  ),
 });
diff --git a/src/apps/console/routes/_main+/$account+/settings+/images/handle-image-discovery.tsx b/src/apps/console/routes/_main+/$account+/settings+/images/handle-image-discovery.tsx
index 1ab14a473..c3a6f851b 100644
--- a/src/apps/console/routes/_main+/$account+/settings+/images/handle-image-discovery.tsx
+++ b/src/apps/console/routes/_main+/$account+/settings+/images/handle-image-discovery.tsx
@@ -21,10 +21,7 @@ export const RegistryImageInstruction = ({
   const { data, isLoading, error } = useCustomSwr(
     'registry-image-instructions',
     async () => {
-      return api.getRegistryImageUrl({
-        // image: '<image_name:image_tag>',
-        // meta: {},
-      });
+      return api.getRegistryImageUrl();
     }
   );
 
diff --git a/src/apps/console/server/gql/queries/registry-image-queries.ts b/src/apps/console/server/gql/queries/registry-image-queries.ts
index 408a66ecb..90c59a8bd 100644
--- a/src/apps/console/server/gql/queries/registry-image-queries.ts
+++ b/src/apps/console/server/gql/queries/registry-image-queries.ts
@@ -29,7 +29,7 @@ export const registryImagesQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleDeleteRegistryImageMutation) =>
         data.core_deleteRegistryImage,
-      vars(_: ConsoleDeleteRegistryImageMutationVariables) { },
+      vars(_: ConsoleDeleteRegistryImageMutationVariables) {},
     }
   ),
   getRegistryImage: executor(
@@ -51,7 +51,7 @@ export const registryImagesQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleGetRegistryImageQuery) =>
         data.core_getRegistryImage,
-      vars(_: ConsoleGetRegistryImageQueryVariables) { },
+      vars(_: ConsoleGetRegistryImageQueryVariables) {},
     }
   ),
   getRegistryImageUrl: executor(
@@ -66,7 +66,7 @@ export const registryImagesQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleGetRegistryImageUrlQuery) =>
         data.core_getRegistryImageURL,
-      vars(_: ConsoleGetRegistryImageUrlQueryVariables) { },
+      vars(_: ConsoleGetRegistryImageUrlQueryVariables) {},
     }
   ),
   listRegistryImages: executor(
@@ -101,7 +101,7 @@ export const registryImagesQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleListRegistryImagesQuery) => {
         return data.core_listRegistryImages;
       },
-      vars(_: ConsoleListRegistryImagesQueryVariables) { },
+      vars(_: ConsoleListRegistryImagesQueryVariables) {},
     }
   ),
 });
diff --git a/src/generated/gql/server.ts b/src/generated/gql/server.ts
index 7dc659db8..892312215 100644
--- a/src/generated/gql/server.ts
+++ b/src/generated/gql/server.ts
@@ -8132,6 +8132,23 @@ export type AuthCli_GetRemoteLoginQuery = {
   auth_getRemoteLogin?: { authHeader?: string; status: string };
 };
 
+export type AuthCli_ListAccountClustersQueryVariables = Exact<{
+  pagination?: InputMaybe<CursorPaginationIn>;
+}>;
+
+export type AuthCli_ListAccountClustersQuery = {
+  infra_listBYOKClusters?: {
+    edges: Array<{
+      node: {
+        clusterToken: string;
+        displayName: string;
+        id: string;
+        metadata: { name: string; labels?: any };
+      };
+    }>;
+  };
+};
+
 export type AuthCli_CreateClusterReferenceMutationVariables = Exact<{
   cluster: ByokClusterIn;
 }>;
@@ -8275,27 +8292,6 @@ export type AuthCli_ListImportedManagedResourcesQuery = {
   };
 };
 
-export type AuthCli_ListByokClustersQueryVariables = Exact<{
-  search?: InputMaybe<SearchCluster>;
-  pagination?: InputMaybe<CursorPaginationIn>;
-}>;
-
-export type AuthCli_ListByokClustersQuery = {
-  infra_listBYOKClusters?: {
-    totalCount: number;
-    edges: Array<{
-      cursor: string;
-      node: {
-        clusterToken: string;
-        displayName: string;
-        id: string;
-        updateTime: any;
-        metadata: { name: string; namespace?: string };
-      };
-    }>;
-  };
-};
-
 export type AuthSetRemoteAuthHeaderMutationVariables = Exact<{
   loginId: Scalars['String']['input'];
   authHeader?: InputMaybe<Scalars['String']['input']>;