diff --git a/gql-queries-generator/doc/queries.graphql b/gql-queries-generator/doc/queries.graphql
index 5d9ac45d0..b84e9f0f9 100644
--- a/gql-queries-generator/doc/queries.graphql
+++ b/gql-queries-generator/doc/queries.graphql
@@ -3022,7 +3022,6 @@ query consoleGetClusterMSv($name: String!) {
     displayName
     isArchived
     id
-    kind
     lastUpdatedBy {
       userEmail
       userId
@@ -3093,7 +3092,6 @@ query consoleListClusterMSvs($pagination: CursorPaginationIn, $search: SearchClu
         creationTime
         displayName
         id
-        kind
         lastUpdatedBy {
           userEmail
           userId
@@ -4853,7 +4851,7 @@ query authCli_listServices($envName: String!, $pagination: CursorPaginationIn) {
         interceptStatus {
           intercepted
           portMappings {
-            containerPort
+            devicePort
             servicePort
           }
           toAddr
diff --git a/src/apps/auth/server/gql/cli-queries.ts b/src/apps/auth/server/gql/cli-queries.ts
index 592a15eda..cb26d11c8 100644
--- a/src/apps/auth/server/gql/cli-queries.ts
+++ b/src/apps/auth/server/gql/cli-queries.ts
@@ -50,7 +50,7 @@ export const cliQueries = (executor: IExecutor) => ({
         return data.infra_createGlobalVPNDevice;
       },
       vars(_: any) {},
-    }
+    },
   ),
 
   cli_getDNSHostSuffix: executor(
@@ -64,7 +64,7 @@ export const cliQueries = (executor: IExecutor) => ({
         return data.core_getDNSHostSuffix;
       },
       vars(_: any) {},
-    }
+    },
   ),
 
   cli_getMresOutputKeyValues: executor(
@@ -86,7 +86,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_getManagedResouceOutputKeyValues,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_getGlobalVpnDevice: executor(
@@ -133,7 +133,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.infra_getGlobalVPNDevice,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_coreCheckNameAvailability: executor(
@@ -151,7 +151,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_checkNameAvailability,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_getMresKeys: executor(
@@ -166,7 +166,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_getManagedResouceOutputKeys,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_listMreses: executor(
@@ -191,7 +191,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_listManagedResources,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_getMresConfigsValues: executor(
@@ -213,7 +213,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_infraCheckNameAvailability: executor(
@@ -236,7 +236,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.infra_checkNameAvailability,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_getConfigSecretMap: executor(
@@ -279,7 +279,7 @@ export const cliQueries = (executor: IExecutor) => ({
         };
       },
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_intercepExternalApp: executor(
@@ -303,7 +303,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_interceptExternalApp,
       vars: (_: any) => {},
-    }
+    },
   ),
   // cli_interceptApp: executor(
   //   gql`
@@ -351,7 +351,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_interceptApp,
       vars: (_: any) => {},
-    }
+    },
   ),
   cli_removeDeviceIntercepts: executor(
     gql`
@@ -365,7 +365,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_removeDeviceIntercepts,
       vars(_: any) {},
-    }
+    },
   ),
   cli_getEnvironment: executor(
     gql`
@@ -393,7 +393,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_getEnvironment,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_updateEnvironment: executor(
@@ -407,7 +407,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_updateEnvironment,
       vars(_: any) {},
-    }
+    },
   ),
 
   cli_cloneEnvironment: executor(
@@ -448,7 +448,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_cloneEnvironment,
       vars(_: any) {},
-    }
+    },
   ),
   cli_getSecret: executor(
     gql`
@@ -466,7 +466,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_getSecret,
       vars: (_: any) => {},
-    }
+    },
   ),
   cli_getConfig: executor(
     gql`
@@ -484,7 +484,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_getConfig,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_listServices: executor(
@@ -506,7 +506,7 @@ export const cliQueries = (executor: IExecutor) => ({
               interceptStatus {
                 intercepted
                 portMappings {
-                  containerPort
+                  devicePort
                   servicePort
                 }
                 toAddr
@@ -582,7 +582,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_listServiceBindings,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_createServiceIntercept: executor(
@@ -604,7 +604,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_createServiceIntercept,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_deleteServiceIntercept: executor(
@@ -622,7 +622,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_deleteServiceIntercept,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_listApps: executor(
@@ -719,7 +719,7 @@ export const cliQueries = (executor: IExecutor) => ({
         return data.apps;
       },
       vars: (_: any) => {},
-    }
+    },
   ),
   cli_listConfigs: executor(
     gql`
@@ -742,7 +742,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_listConfigs,
       vars: (_: any) => {},
-    }
+    },
   ),
   cli_listSecrets: executor(
     gql`
@@ -767,7 +767,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_listSecrets,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_listEnvironments: executor(
@@ -810,7 +810,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_listEnvironments,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_getKubeConfig: executor(
@@ -830,7 +830,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.infra_getCluster,
       vars: (_: any) => {},
-    }
+    },
   ),
   cli_listClusters: executor(
     gql`
@@ -853,7 +853,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.infra_listClusters,
       vars: (_: any) => {},
-    }
+    },
   ),
   cli_listVPNDevices: executor(
     gql`
@@ -916,7 +916,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.infra_listGlobalVPNDevices,
       vars: (_: any) => {},
-    }
+    },
   ),
   cli_listAccounts: executor(
     gql`
@@ -932,7 +932,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.accounts_listAccounts,
       vars: (_: any) => {},
-    }
+    },
   ),
   cli_getCurrentUser: executor(
     gql`
@@ -947,7 +947,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.auth_me,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_createRemoteLogin: executor(
@@ -959,7 +959,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.auth_createRemoteLogin,
       vars: (_: any) => {},
-    }
+    },
   ),
 
   cli_getRemoteLogin: executor(
@@ -974,7 +974,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.auth_getRemoteLogin,
       vars: (_: any) => {},
-    }
+    },
   ),
   cli_listAccountClusters: executor(
     gql`
@@ -998,7 +998,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.infra_listBYOKClusters,
       vars(_: any) {},
-    }
+    },
   ),
   cli_getBYOKCluster: executor(
     gql`
@@ -1019,7 +1019,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.infra_getBYOKCluster,
       vars(_: any) {},
-    }
+    },
   ),
   cli_createClusterReference: executor(
     gql`
@@ -1037,7 +1037,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.infra_createBYOKCluster,
       vars(_: any) {},
-    }
+    },
   ),
   cli_deleteClusterReference: executor(
     gql`
@@ -1048,7 +1048,7 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.infra_deleteBYOKCluster,
       vars(_: any) {},
-    }
+    },
   ),
   cli_clusterReferenceInstructions: executor(
     gql`
@@ -1065,12 +1065,12 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => {
         const instructions = JSON.parse(
-          data.infrat_getBYOKClusterSetupInstructions[0].command
+          data.infrat_getBYOKClusterSetupInstructions[0].command,
         );
         return instructions;
       },
       vars(_: any) {},
-    }
+    },
   ),
   cli_listImportedManagedResources: executor(
     gql`
@@ -1207,6 +1207,6 @@ export const cliQueries = (executor: IExecutor) => ({
     {
       transformer: (data: any) => data.core_listImportedManagedResources,
       vars(_: any) {},
-    }
+    },
   ),
 });
diff --git a/src/apps/console/server/gql/queries/cluster-managed-services-queries.ts b/src/apps/console/server/gql/queries/cluster-managed-services-queries.ts
index def14ce3a..32c8b7199 100644
--- a/src/apps/console/server/gql/queries/cluster-managed-services-queries.ts
+++ b/src/apps/console/server/gql/queries/cluster-managed-services-queries.ts
@@ -35,7 +35,6 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
           displayName
           isArchived
           id
-          kind
           lastUpdatedBy {
             userEmail
             userId
@@ -154,7 +153,6 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
               creationTime
               displayName
               id
-              kind
               lastUpdatedBy {
                 userEmail
                 userId
diff --git a/src/generated/gql/server.ts b/src/generated/gql/server.ts
index e0d922584..d2d91bfa4 100644
--- a/src/generated/gql/server.ts
+++ b/src/generated/gql/server.ts
@@ -4802,7 +4802,6 @@ export type ConsoleGetClusterMSvQuery = {
     displayName: string;
     isArchived?: boolean;
     id: string;
-    kind?: string;
     markedForDeletion?: boolean;
     recordVersion: number;
     updateTime: any;
@@ -4870,7 +4869,6 @@ export type ConsoleListClusterMSvsQuery = {
         creationTime: any;
         displayName: string;
         id: string;
-        kind?: string;
         markedForDeletion?: boolean;
         recordVersion: number;
         updateTime: any;
@@ -6647,7 +6645,7 @@ export type AuthCli_ListServicesQuery = {
         interceptStatus?: {
           intercepted?: boolean;
           toAddr: string;
-          portMappings?: Array<{ containerPort: number; servicePort: number }>;
+          portMappings?: Array<{ devicePort: number; servicePort: number }>;
         };
         metadata?: {
           annotations?: any;