diff --git a/gql-queries-generator/doc/queries.graphql b/gql-queries-generator/doc/queries.graphql
index f8b32d672..bbfc47a5a 100644
--- a/gql-queries-generator/doc/queries.graphql
+++ b/gql-queries-generator/doc/queries.graphql
@@ -3135,6 +3135,7 @@ query consoleGetClusterMSv($name: String!) {
     clusterName
     creationTime
     displayName
+    isArchived
     id
     kind
     lastUpdatedBy {
@@ -3206,6 +3207,7 @@ query consoleListClusterMSvs($pagination: CursorPaginationIn, $search: SearchClu
         accountName
         apiVersion
         clusterName
+        isArchived
         createdBy {
           userEmail
           userId
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/_layout.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/_layout.tsx
index 2e94c38d7..c77fae868 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/_layout.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/_layout.tsx
@@ -1,13 +1,9 @@
 import {
-  // BackingServices,
+  BackingServices,
   CirclesFour,
   GearSix,
-  // Plus,
-  // Search,
   File,
   TreeStructure,
-  // Check,
-  // ChevronUpDown,
 } from '~/console/components/icons';
 import {
   Link,
@@ -17,23 +13,15 @@ import {
   useParams,
 } from '@remix-run/react';
 import { useState } from 'react';
-// import OptionList from '~/components/atoms/option-list';
 import { CommonTabs } from '~/console/components/common-navbar-tabs';
 import HandleScope from '~/console/page-components/handle-environment';
 import { GQLServerHandler } from '~/console/server/gql/saved-queries';
 import { parseName } from '~/console/server/r-utils/common';
-import {
-  // ensureAccountClientSide,
-  ensureAccountSet,
-} from '~/console/server/utils/auth-utils';
+import { ensureAccountSet } from '~/console/server/utils/auth-utils';
 import { SubNavDataProvider } from '~/lib/client/hooks/use-create-subnav-action';
-// import useDebounce from '~/lib/client/hooks/use-debounce';
 import { IRemixCtx, LoaderResult } from '~/lib/types/common';
-// import { useConsoleApi } from '~/console/server/gql/api-provider';
 import { BreadcrumSlash, tabIconSize } from '~/console/utils/commons';
 import { IEnvironment } from '~/console/server/gql/queries/environment-queries';
-// import { cn } from '~/components/utils';
-// import useCustomSwr from '~/lib/client/hooks/use-custom-swr';
 import { ILoginUrls, ILogins } from '~/console/server/gql/queries/git-queries';
 import logger from '~/root/lib/client/helpers/log';
 import Breadcrum from '~/console/components/breadcrum';
@@ -103,16 +91,16 @@ const tabs = [
     to: '/cs/configs',
     value: '/cs',
   },
-  // {
-  //   label: (
-  //     <span className="flex flex-row items-center gap-lg">
-  //       <BackingServices size={tabIconSize} />
-  //       Managed resources
-  //     </span>
-  //   ),
-  //   to: '/managed-resources',
-  //   value: '/managed-resources',
-  // },
+  {
+    label: (
+      <span className="flex flex-row items-center gap-lg">
+        <BackingServices size={tabIconSize} />
+        Integrated resources
+      </span>
+    ),
+    to: '/managed-resources',
+    value: '/managed-resources',
+  },
   // {
   //   label: 'Jobs & Crons',
   //   to: '/jc/task',
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/handle-managed-resource-v2.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/handle-managed-resource-v2.tsx
index 9eeac517f..8d99c0223 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/handle-managed-resource-v2.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/handle-managed-resource-v2.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable react/destructuring-assignment */
-import { toast } from 'react-toastify';
 import Popup from '~/components/molecule/popup';
 import { useReload } from '~/root/lib/client/helpers/reloader';
 import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form';
@@ -13,7 +12,7 @@ import {
 } from '~/console/server/r-utils/common';
 import Select from '~/components/atoms/select';
 import { useConsoleApi } from '~/console/server/gql/api-provider';
-import { useOutletContext } from '@remix-run/react';
+import { useOutletContext, useParams } from '@remix-run/react';
 import useCustomSwr from '~/root/lib/client/hooks/use-custom-swr';
 import { useMapper } from '~/components/utils';
 import MultiStep, { useMultiStep } from '~/console/components/multi-step';
@@ -23,6 +22,8 @@ import { ListItem } from '~/console/components/console-list-components';
 import { CopyContentToClipboard } from '~/console/components/common-console-components';
 import { useEffect, useState } from 'react';
 import { IManagedResources } from '~/console/server/gql/queries/managed-resources-queries';
+import { toast } from '~/components/molecule/toast';
+import { ensureAccountClientSide } from '~/console/server/utils/auth-utils';
 import { IEnvironmentContext } from '../_layout';
 
 type BaseType = ExtractNodeType<IManagedResources>;
@@ -59,10 +60,10 @@ const Root = (props: IDialog) => {
           },
       validationSchema: Yup.object({
         managedServiceName: Yup.string().required(
-          'managed service is required'
+          'integrated service is required'
         ),
         managedResourceName: Yup.string().required(
-          'managed resource name is required'
+          'integrated resource name is required'
         ),
       }),
       onSubmit: async (val) => {
@@ -80,7 +81,9 @@ const Root = (props: IDialog) => {
           reloadPage();
           resetValues();
           toast.success(
-            `managed resource ${isUpdate ? 'updated' : 'imported'} successfully`
+            `integrated resource ${
+              isUpdate ? 'updated' : 'imported'
+            } successfully`
           );
           setVisible(false);
         } catch (err) {
@@ -145,11 +148,11 @@ const Root = (props: IDialog) => {
       <Popup.Content>
         <div className="flex flex-col gap-2xl">
           <Select
-            label="Select Managed Services"
+            label="Integrated Services"
             size="lg"
             value={values.managedServiceName}
             disabled={msvcIsLoading}
-            placeholder="Select a Managed Service"
+            placeholder="Select a Integrated Service"
             options={async () => [
               ...((msvcList &&
                 msvcList.filter((msvc) => {
@@ -166,11 +169,11 @@ const Root = (props: IDialog) => {
           />
 
           <Select
-            label="Select Managed Resource"
+            label="Integrated Resource"
             size="lg"
             value={values.managedResourceName}
             disabled={mresIsLoading}
-            placeholder="Select a Managed Resource"
+            placeholder="Select a Integrated Resource"
             options={async () => [
               ...((mresList &&
                 mresList.filter((mres) => {
@@ -206,7 +209,7 @@ const HandleManagedResourceV2 = (props: IDialog) => {
   return (
     <Popup.Root show={visible} onOpenChange={(v) => setVisible(v)}>
       <Popup.Header>
-        {isUpdate ? 'Edit External Name' : 'Import Managed Resource'}
+        {isUpdate ? 'Edit External Name' : 'Import Integrated Resource'}
       </Popup.Header>
       {(!isUpdate || (isUpdate && props.data)) && <Root {...props} />}
     </Popup.Root>
@@ -227,6 +230,8 @@ export const ViewSecret = ({
   const api = useConsoleApi();
   const { environment } = useOutletContext<IEnvironmentContext>();
   const [onYesClick, setOnYesClick] = useState(false);
+  const params = useParams();
+  ensureAccountClientSide(params);
   const { data, isLoading, error } = useCustomSwr(
     () =>
       onYesClick
@@ -246,6 +251,55 @@ export const ViewSecret = ({
     }
   );
 
+  const dataSecret = () => {
+    if (isLoading) {
+      return <LoadingPlaceHolder />;
+    }
+    if (error) {
+      return <p>Error: {error}</p>;
+    }
+    if (!data?.data) {
+      return <p>No secret found</p>;
+    }
+
+    return (
+      <ListV2.Root
+        data={{
+          headers: [
+            {
+              render: () => 'Key',
+              name: 'key',
+              className: 'min-w-[170px]',
+            },
+            {
+              render: () => 'Value',
+              name: 'value',
+              className: 'flex-1 min-w-[345px] max-w-[345px] w-[345px]',
+            },
+          ],
+          rows: Object.entries(data.data || {}).map(([key, value]) => {
+            const v = value as string;
+            return {
+              columns: {
+                key: {
+                  render: () => <ListItem data={key} />,
+                },
+                value: {
+                  render: () => (
+                    <CopyContentToClipboard
+                      content={atob(v)}
+                      toastMessage={`${key} copied`}
+                    />
+                  ),
+                },
+              },
+            };
+          }),
+        }}
+      />
+    );
+  };
+
   useEffect(() => {
     if (error) {
       toast.error(error);
@@ -268,51 +322,7 @@ export const ViewSecret = ({
               <p>{`Are you sure you want to view the secrets of '${item.syncedOutputSecretRef?.metadata?.name}'?`}</p>
             </div>
           </MultiStep.Step>
-          <MultiStep.Step step={1}>
-            {isLoading ? (
-              <LoadingPlaceHolder />
-            ) : (
-              data && (
-                <ListV2.Root
-                  data={{
-                    headers: [
-                      {
-                        render: () => 'Key',
-                        name: 'key',
-                        className: 'min-w-[170px]',
-                      },
-                      {
-                        render: () => 'Value',
-                        name: 'value',
-                        className:
-                          'flex-1 min-w-[345px] max-w-[345px] w-[345px]',
-                      },
-                    ],
-                    rows: Object.entries(data.stringData).map(
-                      ([key, value]) => {
-                        const v = value as string;
-                        return {
-                          columns: {
-                            key: {
-                              render: () => <ListItem data={key} />,
-                            },
-                            value: {
-                              render: () => (
-                                <CopyContentToClipboard
-                                  content={v}
-                                  toastMessage={`${key} copied`}
-                                />
-                              ),
-                            },
-                          },
-                        };
-                      }
-                    ),
-                  }}
-                />
-              )
-            )}
-          </MultiStep.Step>
+          <MultiStep.Step step={1}>{dataSecret()}</MultiStep.Step>
         </MultiStep.Root>
       </Popup.Content>
       <Popup.Footer>
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/managed-resources-resource-v2.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/managed-resources-resource-v2.tsx
index ec20f2295..7852bdccb 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/managed-resources-resource-v2.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/managed-resources-resource-v2.tsx
@@ -163,7 +163,7 @@ const ListView = ({ items = [], onAction, templates }: IResource) => {
             className: 'flex-1',
           },
           {
-            render: () => 'Managed Service',
+            render: () => 'Integrated Service',
             name: 'service',
             className: 'w-[200px]',
           },
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/route.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/route.tsx
index 7aee47738..606ffdfda 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/route.tsx
@@ -12,6 +12,7 @@ import { useState } from 'react';
 import { IAccountContext } from '~/console/routes/_main+/$account+/_layout';
 import { EmptyManagedResourceImage } from '~/console/components/empty-resource-images';
 import { getSearch } from '~/console/server/utils/common';
+import { ensureAccountSet } from '~/console/server/utils/auth-utils';
 import Tools from './tools';
 import ManagedResourceResourcesV2 from './managed-resources-resource-v2';
 import HandleManagedResourceV2 from './handle-managed-resource-v2';
@@ -19,6 +20,8 @@ import HandleManagedResourceV2 from './handle-managed-resource-v2';
 export const loader = (ctx: IRemixCtx) => {
   const { environment } = ctx.params;
   const promise = pWrapper(async () => {
+    ensureAccountSet(ctx);
+
     const { data: mData, errors: mErrors } = await GQLServerHandler(
       ctx.request
     ).listManagedResources({
@@ -60,11 +63,11 @@ const KlOperatorServices = () => {
           return (
             <Wrapper
               header={{
-                title: 'Managed resources',
+                title: 'Integrated resources',
                 action: managedResources.length > 0 && (
                   <Button
                     variant="primary"
-                    content="Import managed resource"
+                    content="Import Integrated resource"
                     prefix={<Plus />}
                     onClick={() => {
                       setVisible(true);
@@ -75,15 +78,15 @@ const KlOperatorServices = () => {
               empty={{
                 image: <EmptyManagedResourceImage />,
                 is: managedResources.length === 0,
-                title: 'This is where you’ll manage your Managed resources.',
+                title: 'This is where you’ll manage your Integrated resources.',
                 content: (
                   <p>
-                    You can import a new backing resource and manage the listed
-                    backing resource.
+                    You can import a new integrated resource and manage the
+                    listed integrated resource.
                   </p>
                 ),
                 action: {
-                  content: 'Import managed resource',
+                  content: 'Import integrated resource',
                   prefix: <Plus />,
                   onClick: () => {
                     setVisible(true);
diff --git a/src/apps/console/routes/_main+/$account+/environments/environment-resources-v2.tsx b/src/apps/console/routes/_main+/$account+/environments/environment-resources-v2.tsx
index d8d60c164..225a3bbf6 100644
--- a/src/apps/console/routes/_main+/$account+/environments/environment-resources-v2.tsx
+++ b/src/apps/console/routes/_main+/$account+/environments/environment-resources-v2.tsx
@@ -62,6 +62,13 @@ const ExtraButton = ({ item, onAction }: IExtraButton) => {
   return item.isArchived ? (
     <ResourceExtraAction
       options={[
+        {
+          label: 'Clone',
+          icon: <Copy size={16} />,
+          type: 'item',
+          key: 'clone',
+          onClick: () => onAction({ action: 'clone', item }),
+        },
         {
           label: 'Delete',
           icon: <Trash size={16} />,
@@ -206,21 +213,6 @@ const ListView = ({ items, onAction }: IResource) => {
                     <SyncStatusV2 item={i} />
                   ),
               },
-              // environment: {
-              //   render: () => (
-              //     <Badge
-              //       icon={
-              //         i.spec?.routing?.mode === 'private' ? (
-              //           <ShieldCheck />
-              //         ) : (
-              //           <Globe />
-              //         )
-              //       }
-              //     >
-              //       {i.spec?.routing?.mode}
-              //     </Badge>
-              //   ),
-              // },
               updated: {
                 render: () => (
                   <ListItem
@@ -233,7 +225,6 @@ const ListView = ({ items, onAction }: IResource) => {
                 render: () => <ExtraButton item={i} onAction={onAction} />,
               },
             },
-            // to: `/${account}/env/${id}`,
             ...(i.isArchived ? {} : { to: `/${account}/env/${id}` }),
           };
         }),
diff --git a/src/apps/console/routes/_main+/$account+/managed-services/backend-services-resources-V2.tsx b/src/apps/console/routes/_main+/$account+/managed-services/backend-services-resources-V2.tsx
index fb4e8e376..7d1c7386e 100644
--- a/src/apps/console/routes/_main+/$account+/managed-services/backend-services-resources-V2.tsx
+++ b/src/apps/console/routes/_main+/$account+/managed-services/backend-services-resources-V2.tsx
@@ -1,4 +1,4 @@
-import { Copy, GearSix } from '~/console/components/icons';
+import { Copy, GearSix, Trash } from '~/console/components/icons';
 import { generateKey, titleCase } from '~/components/utils';
 import {
   ListItem,
@@ -21,6 +21,12 @@ import ListV2 from '~/console/components/listV2';
 import { IClusterMSvs } from '~/console/server/gql/queries/cluster-managed-services-queries';
 import { useWatchReload } from '~/root/lib/client/helpers/socket/useWatch';
 import { useState } from 'react';
+import DeleteDialog from '~/console/components/delete-dialog';
+import { useConsoleApi } from '~/console/server/gql/api-provider';
+import { useReload } from '~/root/lib/client/helpers/reloader';
+import { toast } from '~/components/molecule/toast';
+import { handleError } from '~/root/lib/utils/common';
+import { Badge } from '~/components/atoms/badge';
 import { IAccountContext } from '../_layout';
 import { IClusterContext } from '../infra+/$cluster+/_layout';
 import CloneManagedService from './clone-managed-service';
@@ -45,7 +51,13 @@ const parseItem = (item: BaseType, templates: IMSvTemplates) => {
   };
 };
 
-type OnAction = ({ action, item }: { action: 'clone'; item: BaseType }) => void;
+type OnAction = ({
+  action,
+  item,
+}: {
+  action: 'clone' | 'delete';
+  item: BaseType;
+}) => void;
 
 type IExtraButton = {
   onAction: OnAction;
@@ -54,7 +66,27 @@ type IExtraButton = {
 
 const ExtraButton = ({ item, onAction }: IExtraButton) => {
   const { account } = useParams();
-  return (
+  return item.isArchived ? (
+    <ResourceExtraAction
+      options={[
+        {
+          label: 'Clone',
+          icon: <Copy size={16} />,
+          type: 'item',
+          key: 'clone',
+          onClick: () => onAction({ action: 'clone', item }),
+        },
+        {
+          label: 'Delete',
+          icon: <Trash size={16} />,
+          type: 'item',
+          onClick: () => onAction({ action: 'delete', item }),
+          key: 'delete',
+          className: '!text-text-critical',
+        },
+      ]}
+    />
+  ) : (
     <ResourceExtraAction
       options={[
         {
@@ -194,10 +226,17 @@ const ListView = ({ items, templates, onAction }: IResource) => {
                 ),
               },
               cluster: {
-                render: () => <ListItem data={i.clusterName} />,
+                render: () => (
+                  <ListItem data={i.isArchived ? '' : i.clusterName} />
+                ),
               },
               status: {
-                render: () => <SyncStatusV2 item={i} />,
+                render: () =>
+                  i.isArchived ? (
+                    <Badge type="neutral">Archived</Badge>
+                  ) : (
+                    <SyncStatusV2 item={i} />
+                  ),
               },
               updated: {
                 render: () => (
@@ -211,7 +250,10 @@ const ListView = ({ items, templates, onAction }: IResource) => {
                 render: () => <ExtraButton item={i} onAction={onAction} />,
               },
             },
-            to: `/${parseName(account)}/msvc/${id}/managed-resources`,
+            // to: `/${parseName(account)}/msvc/${id}/managed-resources`,
+            ...(i.isArchived
+              ? {}
+              : { to: `/${parseName(account)}/msvc/${id}/managed-resources` }),
           };
         }),
       }}
@@ -235,7 +277,12 @@ const BackendServicesResourcesV2 = ({
     })
   );
 
+  const [showDeleteDialog, setShowDeleteDialog] = useState<BaseType | null>(
+    null
+  );
   const [visible, setVisible] = useState<BaseType | null>(null);
+  const api = useConsoleApi();
+  const reloadPage = useReload();
 
   const props: IResource = {
     items,
@@ -245,6 +292,9 @@ const BackendServicesResourcesV2 = ({
         case 'clone':
           setVisible(item);
           break;
+        case 'delete':
+          setShowDeleteDialog(item);
+          break;
         default:
           break;
       }
@@ -257,6 +307,28 @@ const BackendServicesResourcesV2 = ({
         listView={<ListView {...props} />}
         gridView={<GridView {...props} />}
       />
+      <DeleteDialog
+        resourceName={parseName(showDeleteDialog)}
+        resourceType={RESOURCE_NAME}
+        show={showDeleteDialog}
+        setShow={setShowDeleteDialog}
+        onSubmit={async () => {
+          try {
+            const { errors } = await api.deleteClusterMSv({
+              name: parseName(showDeleteDialog),
+            });
+
+            if (errors) {
+              throw errors[0];
+            }
+            reloadPage();
+            toast.success(`Integrated service deleted successfully`);
+            setShowDeleteDialog(null);
+          } catch (err) {
+            handleError(err);
+          }
+        }}
+      />
       <CloneManagedService
         {...{
           isUpdate: true,
diff --git a/src/apps/console/routes/_main+/$account+/managed-services/route.tsx b/src/apps/console/routes/_main+/$account+/managed-services/route.tsx
index 2e0261739..70d5d1703 100644
--- a/src/apps/console/routes/_main+/$account+/managed-services/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/managed-services/route.tsx
@@ -65,11 +65,11 @@ const KlOperatorServices = () => {
         return (
           <Wrapper
             header={{
-              title: 'Managed services',
+              title: 'Integrated services',
               action: backendServices.length > 0 && (
                 <Button
                   variant="primary"
-                  content="Create managed service"
+                  content="Create integrated service"
                   prefix={<Plus />}
                   to="../new-managed-service"
                   linkComponent={Link}
@@ -79,15 +79,15 @@ const KlOperatorServices = () => {
             empty={{
               image: <EmptyStorageImage />,
               is: backendServices.length === 0,
-              title: 'This is where you’ll manage your Managed services.',
+              title: 'This is where you’ll manage your Integrated services.',
               content: (
                 <p>
-                  You can create a new backing service and manage the listed
-                  backing service.
+                  You can create a new integrated service and manage the listed
+                  integrated service.
                 </p>
               ),
               action: {
-                content: 'Create new managed service',
+                content: 'Create new integrated service',
                 prefix: <Plus />,
                 to: '../new-managed-service',
                 linkComponent: Link,
diff --git a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/_layout.tsx b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/_layout.tsx
index f6ec13e90..e481b28ba 100644
--- a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/_layout.tsx
+++ b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/_layout.tsx
@@ -32,14 +32,14 @@ const ManagedServiceTabs = () => {
       baseurl={`/${account}/msvc/${msv}`}
       backButton={{
         to: `/${account}/managed-services`,
-        label: 'Managed Services',
+        label: 'Integrated Services',
       }}
       tabs={[
         {
           label: (
             <span className="flex flex-row items-center gap-lg">
               <BackingServices size={tabIconSize} />
-              Managed resources
+              Integrated resources
             </span>
           ),
           to: '/managed-resources',
diff --git a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/handle-managed-resource.tsx b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/handle-managed-resource.tsx
index ad8b1a78b..154fea34a 100644
--- a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/handle-managed-resource.tsx
+++ b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/handle-managed-resource.tsx
@@ -28,6 +28,7 @@ import { ListItem } from '~/console/components/console-list-components';
 import { CopyContentToClipboard } from '~/console/components/common-console-components';
 import { LoadingPlaceHolder } from '~/console/components/loading';
 import { IEnvironmentContext } from '~/console/routes/_main+/$account+/env+/$environment+/_layout';
+import { ensureAccountClientSide } from '~/console/server/utils/auth-utils';
 
 type BaseType = ExtractNodeType<IManagedResources>;
 type IDialog = IDialogBase<BaseType> & {
@@ -368,6 +369,8 @@ export const ViewSecret = ({
   const api = useConsoleApi();
   const { environment } = useOutletContext<IEnvironmentContext>();
   const [onClick, setOnClick] = useState(false);
+  const params = useParams();
+  ensureAccountClientSide(params);
   const { data, isLoading, error } = useCustomSwr(
     () =>
       onClick ? `secret _${item.syncedOutputSecretRef?.metadata?.name}` : null,
@@ -384,6 +387,56 @@ export const ViewSecret = ({
       }
     }
   );
+
+  const dataSecret = () => {
+    if (isLoading) {
+      return <LoadingPlaceHolder />;
+    }
+    if (error) {
+      return <p>Error: {error}</p>;
+    }
+    if (!data?.stringData) {
+      return <p>No secret found</p>;
+    }
+
+    return (
+      <ListV2.Root
+        data={{
+          headers: [
+            {
+              render: () => 'Key',
+              name: 'key',
+              className: 'min-w-[170px]',
+            },
+            {
+              render: () => 'Value',
+              name: 'value',
+              className: 'flex-1 min-w-[345px] max-w-[345px] w-[345px]',
+            },
+          ],
+          rows: Object.entries(data.stringData || {}).map(([key, value]) => {
+            const v = value as string;
+            return {
+              columns: {
+                key: {
+                  render: () => <ListItem data={key} />,
+                },
+                value: {
+                  render: () => (
+                    <CopyContentToClipboard
+                      content={v}
+                      toastMessage={`${key} copied`}
+                    />
+                  ),
+                },
+              },
+            };
+          }),
+        }}
+      />
+    );
+  };
+
   useEffect(() => {
     if (error) {
       toast.error(error);
@@ -406,51 +459,7 @@ export const ViewSecret = ({
               <p>{`Are you sure you want to view the secrets of '${item.syncedOutputSecretRef?.metadata?.name}'?`}</p>
             </div>
           </MultiStep.Step>
-          <MultiStep.Step step={1}>
-            {isLoading ? (
-              <LoadingPlaceHolder />
-            ) : (
-              data && (
-                <ListV2.Root
-                  data={{
-                    headers: [
-                      {
-                        render: () => 'Key',
-                        name: 'key',
-                        className: 'min-w-[170px]',
-                      },
-                      {
-                        render: () => 'Value',
-                        name: 'value',
-                        className:
-                          'flex-1 min-w-[345px] max-w-[345px] w-[345px]',
-                      },
-                    ],
-                    rows: Object.entries(data.stringData).map(
-                      ([key, value]) => {
-                        const v = value as string;
-                        return {
-                          columns: {
-                            key: {
-                              render: () => <ListItem data={key} />,
-                            },
-                            value: {
-                              render: () => (
-                                <CopyContentToClipboard
-                                  content={v}
-                                  toastMessage={`${key} copied`}
-                                />
-                              ),
-                            },
-                          },
-                        };
-                      }
-                    ),
-                  }}
-                />
-              )
-            )}
-          </MultiStep.Step>
+          <MultiStep.Step step={1}>{dataSecret()}</MultiStep.Step>
         </MultiStep.Root>
       </Popup.Content>
       <Popup.Footer>
diff --git a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/managed-resources-resource-v2.tsx b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/managed-resources-resource-v2.tsx
index 191142f7c..c20fd25b9 100644
--- a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/managed-resources-resource-v2.tsx
+++ b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/managed-resources-resource-v2.tsx
@@ -154,7 +154,7 @@ const ListView = ({ items = [], onAction, templates }: IResource) => {
           {
             render: () => 'Resource Type',
             name: 'resource',
-            className: 'w-[80px]',
+            className: 'w-[120px]',
           },
           {
             render: () => '',
diff --git a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/route.tsx b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/route.tsx
index ce13413ac..0bb1bf41a 100644
--- a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/route.tsx
@@ -11,12 +11,15 @@ import { Button } from '~/components/atoms/button';
 import { IAccountContext } from '~/console/routes/_main+/$account+/_layout';
 import { EmptyManagedResourceImage } from '~/console/components/empty-resource-images';
 import { getSearch } from '~/console/server/utils/common';
+import { ensureAccountSet } from '~/console/server/utils/auth-utils';
 import Tools from './tools';
 import ManagedResourceResourcesV2 from './managed-resources-resource-v2';
 
 export const loader = (ctx: IRemixCtx) => {
   const { msv } = ctx.params;
   const promise = pWrapper(async () => {
+    ensureAccountSet(ctx);
+
     const { data: mData, errors: mErrors } = await GQLServerHandler(
       ctx.request
     ).listManagedResources({
@@ -50,11 +53,11 @@ const KlOperatorServices = () => {
         return (
           <Wrapper
             header={{
-              title: 'Managed resources',
+              title: 'Integrated resources',
               action: managedResources.length > 0 && (
                 <Button
                   variant="primary"
-                  content="Create managed resource"
+                  content="Create integrated resource"
                   prefix={<Plus />}
                   to="../new-managed-resource"
                   linkComponent={Link}
@@ -64,15 +67,15 @@ const KlOperatorServices = () => {
             empty={{
               image: <EmptyManagedResourceImage />,
               is: managedResources.length === 0,
-              title: 'This is where you’ll manage your Managed resources.',
+              title: 'This is where you’ll manage your integrated resources.',
               content: (
                 <p>
-                  You can create a new backing resource and manage the listed
-                  backing resource.
+                  You can create a new integrated resource and manage the listed
+                  integrated resource.
                 </p>
               ),
               action: {
-                content: 'Create new managed resource',
+                content: 'Create new integrated resource',
                 prefix: <Plus />,
                 to: '../new-managed-resource',
                 linkComponent: Link,
diff --git a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/new-managed-resource/_index.tsx b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/new-managed-resource/_index.tsx
index 93a02098b..35e388053 100644
--- a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/new-managed-resource/_index.tsx
+++ b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/new-managed-resource/_index.tsx
@@ -243,7 +243,9 @@ const TemplateView = ({
 }: ITemplateView) => {
   return (
     <form className="flex flex-col gap-3xl" onSubmit={handleSubmit}>
-      <div className="bodyMd text-text-soft">Create your managed services.</div>
+      <div className="bodyMd text-text-soft">
+        Create your integrated services.
+      </div>
       <Select
         label="Resource type"
         size="lg"
@@ -294,7 +296,7 @@ const FieldView = ({
       }}
     >
       <NameIdView
-        placeholder="Enter managed service name"
+        placeholder="Enter integrated service name"
         label="Name"
         resType="environment"
         name={values.name}
@@ -576,10 +578,10 @@ const App = ({ services }: { services: ExtractNodeType<IClusterMSvs>[] }) => {
 
   return (
     <MultiStepProgressWrapper
-      title="Let’s create new managed resource."
+      title="Let’s create new integrated resource."
       subTitle="Simplify Collaboration and Enhance Productivity with Kloudlite teams"
       backButton={{
-        content: 'Back to managed resources',
+        content: 'Back to integrated resources',
         to: rootUrl,
       }}
     >
@@ -595,7 +597,7 @@ const App = ({ services }: { services: ExtractNodeType<IClusterMSvs>[] }) => {
             resources={resources}
           />
         </MultiStepProgress.Step>
-        <MultiStepProgress.Step label="Configure managed resource" step={2}>
+        <MultiStepProgress.Step label="Configure integrated resource" step={2}>
           <FieldView
             selectedResource={values.selectedResource}
             values={values}
diff --git a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/settings+/general/route.tsx b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/settings+/general/route.tsx
index de97bf057..5110c6f64 100644
--- a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/settings+/general/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/settings+/general/route.tsx
@@ -89,6 +89,7 @@ const ClusterManagedServiceSettingGeneral = () => {
         if (e) {
           throw e[0];
         }
+        toast.success('Integrated service updated successfully');
         setSuccess(true);
         resetAndReload();
       },
@@ -145,11 +146,11 @@ const ClusterManagedServiceSettingGeneral = () => {
           ),
         }}
       >
-        <Box title="Cluster managed service details">
+        <Box title="Integrated service details">
           <div className="flex flex-row items-center gap-3xl">
             <div className="flex-1">
               <TextInput
-                label="Cluster managed service URL"
+                label="Integrated service URL"
                 value={`${consoleBaseUrl}/${parseName(account)}/${parseName(
                   managedService
                 )}`}
@@ -181,7 +182,7 @@ const ClusterManagedServiceSettingGeneral = () => {
             <div className="flex-1">
               <TextInput
                 value={parseName(managedService)}
-                label="Cluster manage service ID"
+                label="Integrated service ID"
                 message="Used when interacting with the Kloudlite API"
                 suffix={
                   <div
@@ -219,18 +220,18 @@ const ClusterManagedServiceSettingGeneral = () => {
         </Box>
 
         <DeleteContainer
-          title="Delete Managed Service"
+          title="Delete Integrated Service"
           action={() => {
             setDeleteClusterMsvc(true);
           }}
         >
-          Permanently remove your Managed service and all of its contents from
-          the Kloudlite platform. This action is not reversible — please
+          Permanently remove your Integrated service and all of its contents
+          from the Kloudlite platform. This action is not reversible — please
           continue with caution.
         </DeleteContainer>
         <DeleteDialog
           resourceName={parseName(managedService)}
-          resourceType="deviceblueprint"
+          resourceType="Integrated service"
           show={deleteClusterMsvc}
           setShow={setDeleteClusterMsvc}
           onSubmit={async () => {
@@ -243,7 +244,7 @@ const ClusterManagedServiceSettingGeneral = () => {
                 throw errors[0];
               }
               reload();
-              toast.success(`cluster managed service deleted successfully`);
+              toast.success(`Integrated service deleted successfully`);
               setDeleteClusterMsvc(false);
               navigate(`/${parseName(account)}/managed-services`);
             } catch (err) {
diff --git a/src/apps/console/routes/_main+/$account+/new-managed-service/_index.tsx b/src/apps/console/routes/_main+/$account+/new-managed-service/_index.tsx
index 3155fc593..33b47a778 100644
--- a/src/apps/console/routes/_main+/$account+/new-managed-service/_index.tsx
+++ b/src/apps/console/routes/_main+/$account+/new-managed-service/_index.tsx
@@ -31,6 +31,7 @@ import {
 import { parseName, parseNodes } from '~/console/server/r-utils/common';
 import useCustomSwr from '~/lib/client/hooks/use-custom-swr';
 import { keyconstants } from '~/console/server/r-utils/key-constants';
+import { toast } from 'react-toastify';
 import { IAccountContext } from '../_layout';
 
 const valueRender = ({ label, icon }: { label: string; icon: string }) => {
@@ -625,6 +626,7 @@ const ManagedServiceLayout = () => {
             if (e) {
               throw e[0];
             }
+            toast.success('Integrated service created successfully');
             navigate(rootUrl);
           } catch (err) {
             handleError(err);
@@ -723,10 +725,10 @@ const ManagedServiceLayout = () => {
 
   return (
     <MultiStepProgressWrapper
-      title="Let’s create new managed service."
+      title="Let’s create new integrated service."
       subTitle="Simplify Collaboration and Enhance Productivity with Kloudlite teams"
       backButton={{
-        content: 'Back to managed services',
+        content: 'Back to integrated services',
         to: rootUrl,
       }}
     >
diff --git a/src/apps/console/routes/_main+/_layout/_layout.tsx b/src/apps/console/routes/_main+/_layout/_layout.tsx
index 32bce5690..a6e7a9ed6 100644
--- a/src/apps/console/routes/_main+/_layout/_layout.tsx
+++ b/src/apps/console/routes/_main+/_layout/_layout.tsx
@@ -36,7 +36,7 @@ import {
   InfraAsCode,
   GearSix,
   Project,
-  // BackingServices,
+  BackingServices,
   BellFill,
   Sliders,
 } from '~/console/components/icons';
@@ -86,16 +86,16 @@ const AccountTabs = () => {
           to: '/environments',
           value: '/environments',
         },
-        // {
-        //   label: (
-        //     <span className="flex flex-row items-center gap-lg">
-        //       <BackingServices size={iconSize} />
-        //       Managed Services
-        //     </span>
-        //   ),
-        //   to: '/managed-services',
-        //   value: '/managed-services',
-        // },
+        {
+          label: (
+            <span className="flex flex-row items-center gap-lg">
+              <BackingServices size={iconSize} />
+              Integrated Services
+            </span>
+          ),
+          to: '/managed-services',
+          value: '/managed-services',
+        },
         {
           label: (
             <span className="flex flex-row items-center gap-lg">
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 7ae503e96..952f19a9b 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
@@ -33,6 +33,7 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
           clusterName
           creationTime
           displayName
+          isArchived
           id
           kind
           lastUpdatedBy {
@@ -152,6 +153,7 @@ export const clusterManagedServicesQueries = (executor: IExecutor) => ({
               accountName
               apiVersion
               clusterName
+              isArchived
               createdBy {
                 userEmail
                 userId
diff --git a/src/generated/gql/sdl.graphql b/src/generated/gql/sdl.graphql
index 0f1d6e720..b5fcd3711 100644
--- a/src/generated/gql/sdl.graphql
+++ b/src/generated/gql/sdl.graphql
@@ -311,6 +311,7 @@ type ClusterManagedService {
   creationTime: Date!
   displayName: String!
   id: ID!
+  isArchived: Boolean
   kind: String
   lastUpdatedBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy!
   markedForDeletion: Boolean
@@ -2135,8 +2136,6 @@ input GlobalVPNIn {
   allocatableCIDRSuffix: Int!
   CIDR: String!
   displayName: String!
-  kloudliteClusterLocalDevice: GlobalVPNKloudliteClusterLocalDeviceIn!
-  kloudliteGatewayDevice: GlobalVPNKloudliteGatewayDeviceIn!
   metadata: MetadataIn!
   nonClusterUseAllowedIPs: [String!]!
   numAllocatedClusterCIDRs: Int!
@@ -2150,21 +2149,11 @@ type GlobalVPNKloudliteClusterLocalDevice {
   name: String!
 }
 
-input GlobalVPNKloudliteClusterLocalDeviceIn {
-  ipAddr: String!
-  name: String!
-}
-
 type GlobalVPNKloudliteGatewayDevice {
   ipAddr: String!
   name: String!
 }
 
-input GlobalVPNKloudliteGatewayDeviceIn {
-  ipAddr: String!
-  name: String!
-}
-
 type GlobalVPNPaginatedRecords {
   edges: [GlobalVPNEdge!]!
   pageInfo: PageInfo!
diff --git a/src/generated/gql/server.ts b/src/generated/gql/server.ts
index 7be9e999a..055aae616 100644
--- a/src/generated/gql/server.ts
+++ b/src/generated/gql/server.ts
@@ -1048,8 +1048,6 @@ export type GlobalVpnIn = {
   allocatableCIDRSuffix: Scalars['Int']['input'];
   CIDR: Scalars['String']['input'];
   displayName: Scalars['String']['input'];
-  kloudliteClusterLocalDevice: GlobalVpnKloudliteClusterLocalDeviceIn;
-  kloudliteGatewayDevice: GlobalVpnKloudliteGatewayDeviceIn;
   metadata: MetadataIn;
   nonClusterUseAllowedIPs: Array<Scalars['String']['input']>;
   numAllocatedClusterCIDRs: Scalars['Int']['input'];
@@ -1058,16 +1056,6 @@ export type GlobalVpnIn = {
   wgInterface: Scalars['String']['input'];
 };
 
-export type GlobalVpnKloudliteClusterLocalDeviceIn = {
-  ipAddr: Scalars['String']['input'];
-  name: Scalars['String']['input'];
-};
-
-export type GlobalVpnKloudliteGatewayDeviceIn = {
-  ipAddr: Scalars['String']['input'];
-  name: Scalars['String']['input'];
-};
-
 export type GlobalVpnDeviceIn = {
   creationMethod?: InputMaybe<Scalars['String']['input']>;
   displayName: Scalars['String']['input'];
@@ -4773,6 +4761,7 @@ export type ConsoleGetClusterMSvQuery = {
     clusterName: string;
     creationTime: any;
     displayName: string;
+    isArchived?: boolean;
     id: string;
     kind?: string;
     markedForDeletion?: boolean;
@@ -4846,6 +4835,7 @@ export type ConsoleListClusterMSvsQuery = {
         accountName: string;
         apiVersion?: string;
         clusterName: string;
+        isArchived?: boolean;
         creationTime: any;
         displayName: string;
         id: string;