diff --git a/src/apps/auth/routes/_index.tsx b/src/apps/auth/routes/_index.tsx
index 8bf612af5..6e9f186b6 100644
--- a/src/apps/auth/routes/_index.tsx
+++ b/src/apps/auth/routes/_index.tsx
@@ -15,7 +15,7 @@ const restActions = async (ctx: IExtRemixCtx) => {
       const { data, errors } = await GQLServerHandler(
         ctx.request
       ).setRemoteAuthHeader({
-        loginId: cookie.get('cliLogin'),
+        loginId: cookie.get('cliLogin') || '',
         authHeader: ctx?.request?.headers?.get('cookie'),
       });
 
diff --git a/src/apps/console/components/commons.tsx b/src/apps/console/components/commons.tsx
index f4e32ac69..70e5ecdcc 100644
--- a/src/apps/console/components/commons.tsx
+++ b/src/apps/console/components/commons.tsx
@@ -5,8 +5,8 @@ import { WorkspacesLogo } from '~/components/branding/workspace-logo';
 import useClipboard from '~/root/lib/client/hooks/use-clipboard';
 import { generateKey, titleCase } from '~/components/utils';
 import {
-  Kloudlite__Io___Pkg___Types__SyncStatusState as SyncState,
-  Kloudlite__Io___Pkg___Types__SyncStatusAction as SyncAction,
+  Github__Com___Kloudlite___Api___Pkg___Types__SyncStatusState as SyncState,
+  Github__Com___Kloudlite___Api___Pkg___Types__SyncStatusAction as SyncAction,
 } from '~/root/src/generated/gql/server';
 import Tooltip from '~/components/atoms/tooltip';
 import { Link } from '@remix-run/react';
diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx
index 752dff2c7..49b0c8639 100644
--- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx
+++ b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx
@@ -103,7 +103,7 @@ const HandleBackendResources = ({
         };
       }, {}),
     }),
-    onSubmit: async (val) => {
+    onSubmit: async (_) => {
       try {
         const { errors: e } = await api.createManagedResource({
           mres: {
@@ -113,17 +113,20 @@ const HandleBackendResources = ({
               namespace: parseTargetNs(workspace),
             },
             spec: {
-              mresKind: {
-                kind: selectedType?.resource.kind || '',
-              },
-              msvcRef: {
-                apiVersion: template.apiVersion || '',
-                name: parseName(backendService),
-                kind: template.kind!,
-              },
-              inputs: {
-                ...val,
+              resourceTemplate: {
+                spec: ``,
+                msvcRef: {
+                  apiVersion: template.apiVersion || '',
+                  name: parseName(backendService),
+                  kind: template.kind!,
+                },
               },
+              // mresKind: {
+              //   kind: selectedType?.resource.kind || '',
+              // },
+              // inputs: {
+              //   ...val,
+              // },
             },
           },
         });
diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx
index e9d348d7e..ef1bc3d43 100644
--- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx
+++ b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx
@@ -120,8 +120,8 @@ const BackingResources = () => {
         template={
           getManagedTemplate({
             templates: managedTemplates,
-            kind: backendService.spec.msvcKind.kind || '',
-            apiVersion: backendService.spec.msvcKind.apiVersion,
+            kind: backendService.spec.serviceTemplate.kind || '',
+            apiVersion: backendService.spec.serviceTemplate.apiVersion,
           })!
         }
         setShow={setShowBackendResourceDialog}
diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/backend-services-resources.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/backend-services-resources.tsx
index bd079f5d3..4b7a6f0d8 100644
--- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/backend-services-resources.tsx
+++ b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/backend-services-resources.tsx
@@ -30,8 +30,8 @@ const parseItem = (
 ) => {
   const template = getManagedTemplate({
     templates,
-    kind: item.spec.msvcKind.kind || '',
-    apiVersion: item.spec.msvcKind.apiVersion,
+    kind: item.spec.serviceTemplate.kind || '',
+    apiVersion: item.spec.serviceTemplate.apiVersion,
   });
   return {
     name: item?.displayName,
diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx
index 05cf0c34c..e5454cbb1 100644
--- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx
+++ b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx
@@ -325,13 +325,18 @@ const HandleBackendService = ({
                 annotations: {},
               },
               spec: {
-                msvcKind: {
-                  apiVersion: selectedService?.service.apiVersion || '',
-                  kind: selectedService?.service.kind || '',
-                },
-                inputs: {
-                  ...tempVal,
+                serviceTemplate: {
+                  spec: {
+                    ...tempVal,
+                  },
                 },
+                // msvcKind: {
+                //   apiVersion: selectedService?.service.apiVersion || '',
+                //   kind: selectedService?.service.kind || '',
+                // },
+                // inputs: {
+                //   ...tempVal,
+                // },
               },
             },
           });
diff --git a/src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx b/src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx
index 2b109580d..487e47def 100644
--- a/src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx
+++ b/src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx
@@ -8,7 +8,7 @@ import { useConsoleApi } from '~/console/server/gql/api-provider';
 import useForm from '~/root/lib/client/hooks/use-form';
 import Yup from '~/root/lib/server/helpers/yup';
 import { handleError } from '~/root/lib/utils/common';
-import { Kloudlite__Io___Apps___Iam___Types__Role as Role } from '~/root/src/generated/gql/server';
+import { Github__Com___Kloudlite___Api___Apps___Iam___Types__Role as Role } from '~/root/src/generated/gql/server';
 import { parseName } from '~/console/server/r-utils/common';
 import { IAccountContext } from '../_.$account';
 
diff --git a/src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx b/src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx
index 3cf0e7290..cfa28d76d 100644
--- a/src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx
+++ b/src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx
@@ -10,7 +10,7 @@ import { titleCase, useMapper } from '~/components/utils';
 import useForm from '~/root/lib/client/hooks/use-form';
 import Yup from '~/root/lib/server/helpers/yup';
 import { handleError } from '~/root/lib/utils/common';
-import { Kloudlite__Io___Apps___Iam___Types__Role as Role } from '~/root/src/generated/gql/server';
+import { Github__Com___Kloudlite___Api___Apps___Iam___Types__Role as Role } from '~/root/src/generated/gql/server';
 import { ListBody, ListItem } from '../components/console-list-components';
 import DynamicPagination from '../components/dynamic-pagination';
 import List from '../components/list';
diff --git a/src/apps/console/server/r-utils/common.ts b/src/apps/console/server/r-utils/common.ts
index 77f537cc1..23628d569 100644
--- a/src/apps/console/server/r-utils/common.ts
+++ b/src/apps/console/server/r-utils/common.ts
@@ -6,8 +6,8 @@ import {
   Github__Com___Kloudlite___Operator___Apis___Common____Types__CloudProvider as CloudProvider,
   Github__Com___Kloudlite___Operator___Apis___Clusters___V1__ClusterSpecAvailabilityMode as AvailabilityMode,
   ProjectId,
-  Kloudlite__Io___Pkg___Types__SyncStatusAction as SyncStatusAction,
-  Kloudlite__Io___Pkg___Types__SyncStatusState as SyncStatusState,
+  Github__Com___Kloudlite___Api___Pkg___Types__SyncStatusAction as SyncStatusAction,
+  Github__Com___Kloudlite___Api___Pkg___Types__SyncStatusState as SyncStatusState,
   WorkspaceOrEnvId,
 } from '~/root/src/generated/gql/server';