diff --git a/gql-queries-generator/doc/queries.graphql b/gql-queries-generator/doc/queries.graphql
index 80f53a71e..58c1cb9b1 100644
--- a/gql-queries-generator/doc/queries.graphql
+++ b/gql-queries-generator/doc/queries.graphql
@@ -135,6 +135,7 @@ query consoleListAllClusters($search: SearchCluster, $pagination: CursorPaginati
       cursor
       node {
         accountName
+        ownedBy
         clusterSvcCIDR
         lastOnlineAt
         createdBy {
@@ -2438,9 +2439,6 @@ query consoleGetPvc($clusterName: String!, $name: String!) {
         namespace
       }
       resources {
-        claims {
-          name
-        }
         limits
         requests
       }
@@ -2505,9 +2503,6 @@ query consoleListPvcs($clusterName: String!, $search: SearchPersistentVolumeClai
             namespace
           }
           resources {
-            claims {
-              name
-            }
             limits
             requests
           }
@@ -3386,6 +3381,7 @@ query consoleGetBYOKClusterInstructions($name: String!, $onlyHelmValues: Boolean
 query consoleGetByokCluster($name: String!) {
   infra_getBYOKCluster(name: $name) {
     accountName
+    ownedBy
     createdBy {
       userEmail
       userId
@@ -3430,6 +3426,7 @@ query consoleListByokClusters($search: SearchCluster, $pagination: CursorPaginat
       cursor
       node {
         accountName
+        ownedBy
         clusterSvcCIDR
         lastOnlineAt
         createdBy {
@@ -4489,6 +4486,20 @@ query consoleGetRegistryImageUrl {
   }
 }
 
+query consoleSearchRegistryImages($query: String!) {
+  core_searchRegistryImages(query: $query) {
+    accountName
+    creationTime
+    id
+    imageName
+    imageTag
+    markedForDeletion
+    meta
+    recordVersion
+    updateTime
+  }
+}
+
 query consoleListRegistryImages($pq: CursorPaginationIn) {
   core_listRegistryImages(pq: $pq) {
     edges {
diff --git a/src/apps/console/page-components/app/general.tsx b/src/apps/console/page-components/app/general.tsx
index 0957b335c..0c2a58e7d 100644
--- a/src/apps/console/page-components/app/general.tsx
+++ b/src/apps/console/page-components/app/general.tsx
@@ -2,16 +2,19 @@ import { useParams } from '@remix-run/react';
 import { useCallback, useEffect, useState } from 'react';
 import { Checkbox } from '~/components/atoms/checkbox';
 import { TextInput } from '~/components/atoms/input';
+import Select from '~/components/atoms/select';
 import { BottomNavigation } from '~/console/components/commons';
 import { NameIdView } from '~/console/components/name-id-view';
 import { useAppState } from '~/console/page-components/app-states';
 import { FadeIn } from '~/console/page-components/util';
+import { AppSelectItem } from '~/console/routes/_main+/$account+/env+/$environment+/new-app/app-detail';
 import HandleBuild from '~/console/routes/_main+/$account+/repo+/$repo+/builds/handle-builds';
 import { useConsoleApi } from '~/console/server/gql/api-provider';
-import { parseName, parseNodes } from '~/console/server/r-utils/common';
+import { parseName } from '~/console/server/r-utils/common';
 import { keyconstants } from '~/console/server/r-utils/key-constants';
 import { ensureAccountClientSide } from '~/console/server/utils/auth-utils';
 import { constants } from '~/console/server/utils/constants';
+import useDebounce from '~/root/lib/client/hooks/use-debounce';
 import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form';
 import { useUnsavedChanges } from '~/root/lib/client/hooks/use-unsaved-changes';
 import Yup from '~/root/lib/server/helpers/yup';
@@ -63,28 +66,8 @@ import { handleError } from '~/root/lib/utils/common';
 //   return <ResourceExtraAction options={options} />;
 // };
 
-const AppSelectItem = ({
-  label,
-  value,
-  registry,
-  repository,
-}: {
-  label: string;
-  value: string;
-  registry: string;
-  repository: string;
-}) => {
-  return (
-    <div>
-      <div className="flex flex-col">
-        <div>{label}</div>
-        {registry !== '' && repository !== '' && (
-          <div className="bodySm text-text-soft">{`${registry}/${repository}`}</div>
-        )}
-        {/* <div className="bodySm text-text-soft">{value}</div> */}
-      </div>
-    </div>
-  );
+const valueRenderer = ({ value }: { value: string }) => {
+  return <div>{value}</div>;
 };
 
 const AppGeneral = ({ mode = 'new' }: { mode: 'edit' | 'new' }) => {
@@ -109,38 +92,49 @@ const AppGeneral = ({ mode = 'new' }: { mode: 'edit' | 'new' }) => {
 
   const [imageList, setImageList] = useState<any[]>([]);
   const [imageLoaded, setImageLoaded] = useState(false);
+  const [imageSearchText, setImageSearchText] = useState('');
 
-  const getRegistryImages = useCallback(async () => {
-    ensureAccountClientSide(params);
-    setImageLoaded(true);
-    try {
-      const registrayImages = await api.listRegistryImages({});
-      const data = parseNodes(registrayImages.data).map((i) => ({
-        label: `${i.imageName}:${i.imageTag}`,
-        value: `${i.imageName}:${i.imageTag}`,
-        ready: true,
-        render: () => (
-          <AppSelectItem
-            label={`${i.imageName}:${i.imageTag}`}
-            value={`${i.imageName}:${i.imageTag}`}
-            registry={i.meta.registry || ''}
-            repository={i.meta.repository || ''}
-          />
-        ),
-      }));
-      setImageList(data);
-    } catch (err) {
-      handleError(err);
-    } finally {
-      setImageLoaded(false);
-    }
-  }, []);
+  const getRegistryImages = useCallback(
+    async ({ query }: { query: string }) => {
+      ensureAccountClientSide(params);
+      setImageLoaded(true);
+      try {
+        const registrayImages = await api.searchRegistryImages({ query });
+        const data = registrayImages.data.map((i) => ({
+          label: `${i.imageName}:${i.imageTag}/${i.meta.author}/${i.meta.registry}:${i.meta.repository}`,
+          value: `${i.imageName}:${i.imageTag}`,
+          ready: true,
+          render: () => (
+            <AppSelectItem
+              label={`${i.imageName}:${i.imageTag}`}
+              meta={i.meta}
+              imageSearchText={query}
+            />
+          ),
+        }));
+        setImageList(data);
+      } catch (err) {
+        handleError(err);
+      } finally {
+        setImageLoaded(false);
+      }
+    },
+    []
+  );
 
   useEffect(() => {
-    getRegistryImages();
+    getRegistryImages({ query: '' });
   }, []);
 
-  // const api = useConsoleApi();
+  useDebounce(
+    () => {
+      if (imageSearchText) {
+        getRegistryImages({ query: imageSearchText });
+      }
+    },
+    300,
+    [imageSearchText]
+  );
 
   const {
     values,
@@ -317,7 +311,7 @@ const AppGeneral = ({ mode = 'new' }: { mode: 'edit' | 'new' }) => {
           />
         )}
         <div className="flex flex-col gap-xl">
-          <TextInput
+          {/* <TextInput
             size="lg"
             label="Image name"
             placeholder="Enter Image name"
@@ -325,17 +319,22 @@ const AppGeneral = ({ mode = 'new' }: { mode: 'edit' | 'new' }) => {
             onChange={handleChange('imageUrl')}
             error={!!errors.imageUrl}
             message={errors.imageUrl}
-          />
-          {/* <Select
+          /> */}
+
+          <Select
             label="Select Images"
             size="lg"
             value={values.imageUrl}
             placeholder="Select a image"
             creatable
+            searchable
             options={async () => imageList}
             onChange={({ value }) => {
               handleChange('imageUrl')(dummyEvent(value));
             }}
+            onSearch={(text) => {
+              setImageSearchText(text);
+            }}
             showclear
             noOptionMessage={
               <div className="p-2xl bodyMd text-center">
@@ -346,7 +345,8 @@ const AppGeneral = ({ mode = 'new' }: { mode: 'edit' | 'new' }) => {
             message={errors.imageUrl}
             loading={imageLoaded}
             createLabel="Select"
-          /> */}
+            valueRender={valueRenderer}
+          />
         </div>
 
         <Checkbox
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/new-app/app-detail.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/new-app/app-detail.tsx
index e59db67a1..1be2e7888 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/new-app/app-detail.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/new-app/app-detail.tsx
@@ -2,8 +2,8 @@ import { BottomNavigation, GitDetailRaw } from '~/console/components/commons';
 import { NameIdView } from '~/console/components/name-id-view';
 import { useAppState } from '~/console/page-components/app-states';
 import { FadeIn } from '~/console/page-components/util';
-import { parseName, parseNodes } from '~/console/server/r-utils/common';
-import useForm from '~/root/lib/client/hooks/use-form';
+import { parseName } from '~/console/server/r-utils/common';
+import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form';
 import Yup from '~/root/lib/server/helpers/yup';
 // import { registryHost } from '~/lib/configs/base-url.cjs';
 import { useOutletContext, useParams } from '@remix-run/react';
@@ -13,7 +13,7 @@ import { keyconstants } from '~/console/server/r-utils/key-constants';
 // import ExtendedFilledTab from '~/console/components/extended-filled-tab';
 import { useCallback, useEffect, useState } from 'react';
 import { Button } from '~/components/atoms/button';
-import { TextInput } from '~/components/atoms/input';
+import Select from '~/components/atoms/select';
 import { toast } from '~/components/molecule/toast';
 import {
   ArrowClockwise,
@@ -24,6 +24,7 @@ import ResourceExtraAction from '~/console/components/resource-extra-action';
 import { useConsoleApi } from '~/console/server/gql/api-provider';
 import { ensureAccountClientSide } from '~/console/server/utils/auth-utils';
 import { constants } from '~/console/server/utils/constants';
+import useDebounce from '~/root/lib/client/hooks/use-debounce';
 import { handleError } from '~/root/lib/utils/common';
 import { IEnvironmentContext } from '../_layout';
 import BuildSelectionDialog from './app-build-selection-dialog';
@@ -58,24 +59,52 @@ const ExtraButton = ({
   );
 };
 
-const AppSelectItem = ({
+const valueRenderer = ({ value }: { value: string }) => {
+  return <div>{value}</div>;
+};
+
+export const AppSelectItem = ({
   label,
-  value,
-  registry,
-  repository,
+  meta,
+  imageSearchText,
 }: {
   label: string;
-  value: string;
-  registry: string;
-  repository: string;
+  meta: any;
+  imageSearchText: string;
 }) => {
+  const getHighlightedText = (text: string, highlight: string) => {
+    if (!highlight) return text;
+
+    const regex = new RegExp(`(${highlight})`, 'gi');
+    const parts = text.split(regex);
+
+    return parts.map((part, index) =>
+      part.toLowerCase() === highlight.toLowerCase() ? (
+        // eslint-disable-next-line react/no-array-index-key
+        <span key={index} className="bodySm-semibold text-text-soft">
+          {part}
+        </span>
+      ) : (
+        part
+      )
+    );
+  };
+
   return (
     <div>
-      <div className="flex flex-col">
-        <div>{label}</div>
-        {registry !== '' && repository !== '' && (
-          <div className="bodySm text-text-soft">{`${registry}/${repository}`}</div>
-        )}
+      <div className="flex flex-col gap-md">
+        <div className="bodyMd-semibold ">{label}</div>
+        <div className="flex flex-row gap-md">
+          {meta &&
+            Object.keys(meta).length > 0 &&
+            Object.keys(meta).map((key) => (
+              <div key={key} className="bodySm text-text-soft px-xs">
+                {`${key}: `}
+                {getHighlightedText(meta[key], imageSearchText)}
+                {' |'}
+              </div>
+            ))}
+        </div>
       </div>
     </div>
   );
@@ -104,47 +133,51 @@ const AppDetail = () => {
 
   const [imageList, setImageList] = useState<any[]>([]);
   const [imageLoaded, setImageLoaded] = useState(false);
-  // const [imageSearchText, setImageSearchText] = useState('');
+  const [imageSearchText, setImageSearchText] = useState('');
 
-  const getRegistryImages = useCallback(async () => {
-    ensureAccountClientSide(params);
-    setImageLoaded(true);
-    try {
-      const registrayImages = await api.listRegistryImages({});
-      const data = parseNodes(registrayImages.data).map((i) => ({
-        label: `${i.imageName}:${i.imageTag}`,
-        value: `${i.imageName}:${i.imageTag}`,
-        ready: true,
-        render: () => (
-          <AppSelectItem
-            label={`${i.imageName}:${i.imageTag}`}
-            value={`${i.imageName}:${i.imageTag}`}
-            registry={i.meta.registry || ''}
-            repository={i.meta.repository || ''}
-          />
-        ),
-      }));
-      setImageList(data);
-    } catch (err) {
-      handleError(err);
-    } finally {
-      setImageLoaded(false);
-    }
-  }, []);
+  const getRegistryImages = useCallback(
+    async ({ query }: { query: string }) => {
+      ensureAccountClientSide(params);
+      setImageLoaded(true);
+      try {
+        const registrayImages = await api.searchRegistryImages({
+          query,
+        });
+        const data = registrayImages.data.map((i) => ({
+          label: `${i.imageName}:${i.imageTag}/${i.meta.author}/${i.meta.registry}:${i.meta.repository}`,
+          value: `${i.imageName}:${i.imageTag}`,
+          ready: true,
+          render: () => (
+            <AppSelectItem
+              label={`${i.imageName}:${i.imageTag}`}
+              meta={i.meta}
+              imageSearchText={query}
+            />
+          ),
+        }));
+        setImageList(data);
+      } catch (err) {
+        handleError(err);
+      } finally {
+        setImageLoaded(false);
+      }
+    },
+    []
+  );
 
   useEffect(() => {
-    getRegistryImages();
+    getRegistryImages({ query: '' });
   }, []);
 
-  // useDebounce(
-  //   () => {
-  //     if (imageSearchText) {
-  //       getRegistryImages();
-  //     }
-  //   },
-  //   300,
-  //   [imageSearchText]
-  // );
+  useDebounce(
+    () => {
+      if (imageSearchText) {
+        getRegistryImages({ query: imageSearchText });
+      }
+    },
+    300,
+    [imageSearchText]
+  );
 
   const { values, errors, handleChange, handleSubmit, isLoading, setValues } =
     useForm({
@@ -332,7 +365,7 @@ const AppDetail = () => {
             size="sm"
           /> */}
 
-          <TextInput
+          {/* <TextInput
             size="lg"
             label="Image name"
             placeholder="Enter Image name"
@@ -340,21 +373,22 @@ const AppDetail = () => {
             onChange={handleChange('imageUrl')}
             error={!!errors.imageUrl}
             message={errors.imageUrl}
-          />
+          /> */}
 
-          {/* <Select
+          <Select
             label="Select Images"
             size="lg"
             value={values.imageUrl}
             placeholder="Select a image"
             creatable
+            searchable
             options={async () => imageList}
             onChange={({ value }) => {
               handleChange('imageUrl')(dummyEvent(value));
             }}
-            // onSearch={(text) => {
-            //   setImageSearchText(text);
-            // }}
+            onSearch={(text) => {
+              setImageSearchText(text);
+            }}
             showclear
             noOptionMessage={
               <div className="p-2xl bodyMd text-center">
@@ -365,7 +399,8 @@ const AppDetail = () => {
             message={errors.imageUrl}
             loading={imageLoaded}
             createLabel="Select"
-          /> */}
+            valueRender={valueRenderer}
+          />
 
           {/* {values.imageMode === 'default' && (
             <RepoSelector
diff --git a/src/apps/console/routes/_main+/$account+/environments/route.tsx b/src/apps/console/routes/_main+/$account+/environments/route.tsx
index aa46ccaff..afecc7765 100644
--- a/src/apps/console/routes/_main+/$account+/environments/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/environments/route.tsx
@@ -1,5 +1,5 @@
 import { defer } from '@remix-run/node';
-import { useLoaderData } from '@remix-run/react';
+import { Link, useLoaderData, useParams } from '@remix-run/react';
 import { useState } from 'react';
 import { Button } from '~/components/atoms/button.jsx';
 import { Plus } from '~/console/components/icons';
@@ -30,12 +30,24 @@ export const loader = async (ctx: IRemixCtx) => {
       search: getSearch(ctx),
     });
 
+    const { data: clusterData, errors: clusterErrors } = await GQLServerHandler(
+      ctx.request
+    ).listAllClusters({
+      pagination: getPagination(ctx),
+      search: getSearch(ctx),
+    });
+
+    if (clusterErrors) {
+      throw clusterErrors[0];
+    }
+
     if (errors) {
       throw errors[0];
     }
 
     return {
       environmentData: data || {},
+      clusterList: clusterData || {},
     };
   });
 
@@ -47,6 +59,7 @@ const Workspaces = () => {
     useState<IShowDialog<IEnvironment | null>>(null);
 
   const { promise } = useLoaderData<typeof loader>();
+  const { account } = useParams();
 
   return (
     <>
@@ -55,15 +68,65 @@ const Workspaces = () => {
         skeletonData={{
           environmentData: fake.ConsoleListEnvironmentsQuery
             .core_listEnvironments as any,
+          clusterList: fake.ConsoleListAllClustersQuery.byok_clusters as any,
         }}
       >
-        {({ environmentData }) => {
+        {({ environmentData, clusterList }) => {
           const environments = parseNodes(environmentData);
+          const clusters = parseNodes(clusterList);
 
           if (!environments) {
             return null;
           }
 
+          if (clusters?.length === 0) {
+            return (
+              <Wrapper
+                header={{
+                  title: 'Environments',
+                }}
+                empty={{
+                  image: <EmptyEnvironmentImage />,
+                  is: environments?.length === 0,
+                  title: 'This is where you’ll manage your environment.',
+                  content: (
+                    <p>
+                      You don't have any compute attached to your account.
+                      Please attach a compute to your account to create an
+                      environment.
+                      <br />
+                      Go to{' '}
+                      <Link
+                        to={`/${account}/infra/clusters`}
+                        className="text-text-default"
+                      >
+                        <span className="bodyMd-semibold underline underline-offset-1 text-text-default">
+                          Infrastructure
+                        </span>
+                      </Link>{' '}
+                      to attach your compute or local device.
+                    </p>
+                    /* <Button
+                        size="sm"
+                        content={
+                          <span className="truncate text-left">
+                            Infrastructure
+                          </span>
+                        }
+                        variant="primary-plain"
+                        className="truncate justify-center"
+                        to={`/${account}/infra/clusters`}
+                      /> */
+                  ),
+                }}
+                tools={<Tools />}
+                pagination={environmentData}
+              >
+                <EnvironmentResourcesV2 items={environments || []} />
+              </Wrapper>
+            );
+          }
+
           return (
             <Wrapper
               header={{
diff --git a/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx b/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx
index a754fd7f7..81ba4a5ab 100644
--- a/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx
+++ b/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx
@@ -13,10 +13,10 @@ const Infra = () => {
   return (
     <SidebarLayout
       navItems={[
-        { label: 'Clusters', value: 'clusters' },
+        { label: 'Attached Computes', value: 'clusters' },
         // { label: 'Helm Repos', value: 'helm-repos' },
         // { label: 'Bring your own Kubernetes', value: 'byok-cluster' },
-        { label: 'Devices', value: 'vpn-devices' },
+        { label: 'Wireguard Devices', value: 'vpn-devices' },
       ]}
       parentPath="/infra"
     >
diff --git a/src/apps/console/routes/_main+/$account+/infra+/byok-cluster/handle-byok-cluster.tsx b/src/apps/console/routes/_main+/$account+/infra+/byok-cluster/handle-byok-cluster.tsx
index b5e60b2a7..5bef0f329 100644
--- a/src/apps/console/routes/_main+/$account+/infra+/byok-cluster/handle-byok-cluster.tsx
+++ b/src/apps/console/routes/_main+/$account+/infra+/byok-cluster/handle-byok-cluster.tsx
@@ -1,17 +1,18 @@
 /* eslint-disable react/destructuring-assignment */
 import { toast } from 'react-toastify';
+import { Button } from '~/components/atoms/button';
+import { Checkbox } from '~/components/atoms/checkbox';
+import Banner from '~/components/molecule/banner';
 import Popup from '~/components/molecule/popup';
+import { NameIdView } from '~/console/components/name-id-view';
+import { IDialogBase } from '~/console/components/types.d';
+import { useConsoleApi } from '~/console/server/gql/api-provider';
+import { IByocClusters } from '~/console/server/gql/queries/byok-cluster-queries';
+import { ExtractNodeType, parseName } from '~/console/server/r-utils/common';
 import { useReload } from '~/root/lib/client/helpers/reloader';
 import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form';
 import Yup from '~/root/lib/server/helpers/yup';
 import { handleError } from '~/root/lib/utils/common';
-import { IDialogBase } from '~/console/components/types.d';
-import { ExtractNodeType, parseName } from '~/console/server/r-utils/common';
-import { NameIdView } from '~/console/components/name-id-view';
-import { useConsoleApi } from '~/console/server/gql/api-provider';
-import { IByocClusters } from '~/console/server/gql/queries/byok-cluster-queries';
-import { Checkbox } from '~/components/atoms/checkbox';
-import Banner from '~/components/molecule/banner';
 
 type IDialog = IDialogBase<ExtractNodeType<IByocClusters>>;
 
@@ -25,17 +26,17 @@ const Root = (props: IDialog) => {
     useForm({
       initialValues: isUpdate
         ? {
-            displayName: props.data.displayName,
-            name: parseName(props.data),
-            visibilityMode: false,
-            isNameError: false,
-          }
+          displayName: props.data.displayName,
+          name: parseName(props.data),
+          visibilityMode: false,
+          isNameError: false,
+        }
         : {
-            name: '',
-            displayName: '',
-            visibilityMode: false,
-            isNameError: false,
-          },
+          name: '',
+          displayName: '',
+          visibilityMode: false,
+          isNameError: false,
+        },
       validationSchema: Yup.object({
         name: Yup.string().required('id is required'),
         displayName: Yup.string().required('name is required'),
@@ -69,7 +70,7 @@ const Root = (props: IDialog) => {
           reloadPage();
           resetValues();
           toast.success(
-            `cluster ${isUpdate ? 'updated' : 'created'} successfully`
+            `compute ${isUpdate ? 'updated' : 'created'} successfully`
           );
           setVisible(false);
         } catch (err) {
@@ -123,6 +124,20 @@ const Root = (props: IDialog) => {
                   </div>
                 }
               />
+              <Button
+                target="_blank"
+                size="sm"
+                content={
+                  <span className="truncate text-left">
+                    Attach your local device
+                  </span>
+                }
+                variant="primary-plain"
+                className="truncate justify-center"
+                onClick={() => {
+                  window.location.href = 'https://github.com/kloudlite/kl';
+                }}
+              />
             </>
           )}
         </div>
@@ -146,7 +161,7 @@ const HandleByokCluster = (props: IDialog) => {
   return (
     <Popup.Root show={visible} onOpenChange={(v) => setVisible(v)}>
       <Popup.Header>
-        {isUpdate ? 'Edit Cluster' : 'Attach Cluster'}
+        {isUpdate ? 'Edit Compute' : 'Attach Compute'}
       </Popup.Header>
       {(!isUpdate || (isUpdate && props.data)) && <Root {...props} />}
     </Popup.Root>
diff --git a/src/apps/console/routes/_main+/$account+/infra+/byok-cluster/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/byok-cluster/route.tsx
index 109a13448..86f968c29 100644
--- a/src/apps/console/routes/_main+/$account+/infra+/byok-cluster/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/infra+/byok-cluster/route.tsx
@@ -1,20 +1,20 @@
-import { Plus } from '~/console/components/icons';
 import { defer } from '@remix-run/node';
 import { Link, useLoaderData } from '@remix-run/react';
+import { useState } from 'react';
 import { Button } from '~/components/atoms/button.jsx';
+import { Plus } from '~/console/components/icons';
 import { LoadingComp, pWrapper } from '~/console/components/loading-component';
 import Wrapper from '~/console/components/wrapper';
-import { getPagination, getSearch } from '~/console/server/utils/common';
-import logger from '~/root/lib/client/helpers/log';
-import { ensureAccountSet } from '~/console/server/utils/auth-utils';
 import { GQLServerHandler } from '~/console/server/gql/saved-queries';
-import { IRemixCtx } from '~/root/lib/types/common';
 import { parseNodes } from '~/console/server/r-utils/common';
-import { useState } from 'react';
+import { ensureAccountSet } from '~/console/server/utils/auth-utils';
+import { getPagination, getSearch } from '~/console/server/utils/common';
 import fake from '~/root/fake-data-generator/fake';
-import Tools from './tools';
-import HandleByokCluster from './handle-byok-cluster';
+import logger from '~/root/lib/client/helpers/log';
+import { IRemixCtx } from '~/root/lib/types/common';
 import ByokClusterResource from './byok-cluster-resource';
+import HandleByokCluster from './handle-byok-cluster';
+import Tools from './tools';
 
 export const loader = (ctx: IRemixCtx) => {
   const promise = pWrapper(async () => {
@@ -74,11 +74,12 @@ const ByocClusters = () => {
               }}
               empty={{
                 is: byocClusterData.length === 0,
-                title: 'This is where you’ll manage your kuberenetes cluster.',
+                title:
+                  'This is where you’ll attach your cluster or local devices.',
                 content: (
                   <p>
                     You can create a new kubernetes cluster and manage the
-                    listed kubernetes clusters.
+                    listed kubernetes clusters or attach local devices.
                   </p>
                 ),
                 action: {
@@ -91,9 +92,9 @@ const ByocClusters = () => {
                 },
               }}
               tools={<Tools />}
-              // pagination={{
-              //   pageInfo: byokClusterData.pageInfo,
-              // }}
+            // pagination={{
+            //   pageInfo: byokClusterData.pageInfo,
+            // }}
             >
               <ByokClusterResource items={byocClusterData} />
             </Wrapper>
diff --git a/src/apps/console/routes/_main+/$account+/infra+/clusters/cluster-resources-v2.tsx b/src/apps/console/routes/_main+/$account+/infra+/clusters/cluster-resources-v2.tsx
index bdbb6caac..3bc45a4cb 100644
--- a/src/apps/console/routes/_main+/$account+/infra+/clusters/cluster-resources-v2.tsx
+++ b/src/apps/console/routes/_main+/$account+/infra+/clusters/cluster-resources-v2.tsx
@@ -192,7 +192,7 @@ const ByokButton = ({ item }: { item: CombinedBaseType }) => {
             }}
             size="sm"
             variant="outline"
-            // prefix={<ArrowClockwise size={16} />}
+          // prefix={<ArrowClockwise size={16} />}
           />
         </div>
       )}
@@ -221,7 +221,7 @@ const GetByokClusterMessage = ({
     case timeDifference <= 2:
       return (
         <div className="flex flex-row gap-sm bodyMd-medium text-text-strong pulsable">
-          <span>Attached Cluster</span>
+          <span>Attached Compute</span>
         </div>
       );
     default:
@@ -473,18 +473,22 @@ const ListView = ({ items = [], onEdit, onDelete, onShowLogs }: IResource) => {
                 ),
               },
               provider: {
-                render: () =>
-                  i.type === 'normal' ? (
-                    <span className="bodyMd-medium text-text-strong pulsable">
-                      <span className="pr-lg">Managed by kloudlite on</span>{' '}
-                      {provider}
-                    </span>
-                  ) : (
+                render: () => {
+                  if (i.type === 'byok' && i.ownedBy !== null) {
+                    return (
+                      <div className="flex flex-row gap-sm bodyMd-medium text-text-strong pulsable">
+                        <span>Local Device</span>
+                      </div>
+                    );
+                  }
+                  return (
                     <GetByokClusterMessage
-                      lastOnlineAt={i.lastOnlineAt}
+                      // lastOnlineAt={i.lastOnlineAt}
+                      lastOnlineAt={clusters[id]?.lastOnlineAt}
                       item={i}
                     />
-                  ),
+                  );
+                },
               },
               status: {
                 render: () => (
diff --git a/src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx
index 78353c85a..8173d0674 100644
--- a/src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx
@@ -1,21 +1,21 @@
-import { Plus } from '~/console/components/icons';
 import { defer } from '@remix-run/node';
-import { useLoaderData } from '@remix-run/react';
+import { Link, useLoaderData } from '@remix-run/react';
+import { useState } from 'react';
 import { Button } from '~/components/atoms/button.jsx';
+import { EmptyClusterImage } from '~/console/components/empty-resource-images';
+import { Plus } from '~/console/components/icons';
+import { LoadingComp, pWrapper } from '~/console/components/loading-component';
 import Wrapper from '~/console/components/wrapper';
+import { IByocClusters } from '~/console/server/gql/queries/byok-cluster-queries';
+import { GQLServerHandler } from '~/console/server/gql/saved-queries';
 import { parseNodes } from '~/console/server/r-utils/common';
-import { getPagination, getSearch } from '~/console/server/utils/common';
-import { IRemixCtx } from '~/root/lib/types/common';
-import { LoadingComp, pWrapper } from '~/console/components/loading-component';
 import { ensureAccountSet } from '~/console/server/utils/auth-utils';
-import { GQLServerHandler } from '~/console/server/gql/saved-queries';
-import { useState } from 'react';
-import { IByocClusters } from '~/console/server/gql/queries/byok-cluster-queries';
+import { getPagination, getSearch } from '~/console/server/utils/common';
 import fake from '~/root/fake-data-generator/fake';
-import { EmptyClusterImage } from '~/console/components/empty-resource-images';
-import Tools from './tools';
-import ClusterResourcesV2 from './cluster-resources-v2';
+import { IRemixCtx } from '~/root/lib/types/common';
 import HandleByokCluster from '../byok-cluster/handle-byok-cluster';
+import ClusterResourcesV2 from './cluster-resources-v2';
+import Tools from './tools';
 
 export const loader = async (ctx: IRemixCtx) => {
   const promise = pWrapper(async () => {
@@ -44,7 +44,7 @@ const CreateClusterButton = () => {
   return (
     <>
       <Button
-        content="Attach cluster"
+        content="Attach compute"
         variant="primary"
         prefix={<Plus />}
         onClick={() => {
@@ -88,9 +88,21 @@ const ClusterComponent = ({
       return {
         image: <EmptyClusterImage />,
         is: true,
-        title: 'This is where you’ll manage your cluster.',
+        title: 'This is where you’ll attach your compute or local devices.',
         content: (
-          <p>You can create a new cluster and manage the listed cluster.</p>
+          <p>
+            You can attach a new compute and manage the listed compute.
+            <br />
+            Follow the instructions to attach your{' '}
+            <Link
+              to="https://github.com/kloudlite/kl"
+              className="text-text-default"
+            >
+              <span className="bodyMd-semibold underline underline-offset-1 text-text-default">
+                local device
+              </span>
+            </Link>{' '}
+          </p>
         ),
         action: <CreateClusterButton />,
       };
@@ -100,7 +112,7 @@ const ClusterComponent = ({
       is: false,
       title: 'This is where you’ll manage your cluster.',
       content: (
-        <p>You can create a new cluster and manage the listed cluster.</p>
+        <p>You can create a new compute and manage the listed compute.</p>
       ),
       action: <CreateClusterButton />,
     };
@@ -112,7 +124,7 @@ const ClusterComponent = ({
   return (
     <Wrapper
       secondaryHeader={{
-        title: 'Clusters',
+        title: 'Attached Computes',
         action: byokClusters.length > 0 && <CreateClusterButton />,
       }}
       empty={getEmptyState({
diff --git a/src/apps/console/routes/_main+/$account+/infra+/vpn-devices/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/vpn-devices/route.tsx
index 2338d7c42..3daa97c44 100644
--- a/src/apps/console/routes/_main+/$account+/infra+/vpn-devices/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/infra+/vpn-devices/route.tsx
@@ -1,19 +1,19 @@
-import { Globe, Plus } from '~/console/components/icons';
 import { defer } from '@remix-run/node';
 import { Link, useLoaderData } from '@remix-run/react';
+import { useState } from 'react';
 import { Button } from '~/components/atoms/button.jsx';
+import { Globe, Plus } from '~/console/components/icons';
+import { LoadingComp, pWrapper } from '~/console/components/loading-component';
 import Wrapper from '~/console/components/wrapper';
+import { GQLServerHandler } from '~/console/server/gql/saved-queries';
 import { parseNodes } from '~/console/server/r-utils/common';
-import { IRemixCtx } from '~/root/lib/types/common';
-import { LoadingComp, pWrapper } from '~/console/components/loading-component';
 import { ensureAccountSet } from '~/console/server/utils/auth-utils';
-import { GQLServerHandler } from '~/console/server/gql/saved-queries';
 import { getPagination, getSearch } from '~/console/server/utils/common';
 import fake from '~/root/fake-data-generator/fake';
-import { useState } from 'react';
+import { IRemixCtx } from '~/root/lib/types/common';
+import HandleGlobalVpnDevice from './handle-vpn-device';
 import Tools from './tools';
 import VPNResourcesV2 from './vpn-resources-v2';
-import HandleGlobalVpnDevice from './handle-vpn-device';
 
 export const loader = async (ctx: IRemixCtx) => {
   const promise = pWrapper(async () => {
@@ -99,7 +99,7 @@ const Devices = () => {
           return (
             <Wrapper
               secondaryHeader={{
-                title: 'Devices',
+                title: 'Wireguard Devices',
                 action: vpnDevices.length > 0 && (
                   <Button
                     content="Create device"
@@ -108,7 +108,7 @@ const Devices = () => {
                     onClick={() => {
                       setVisible(true);
                     }}
-                    // LinkComponent={Link}
+                  // LinkComponent={Link}
                   />
                 ),
               }}
diff --git a/src/apps/console/routes/_main+/$account+/settings+/_layout.tsx b/src/apps/console/routes/_main+/$account+/settings+/_layout.tsx
index a9451fde0..cbbcbbcc1 100644
--- a/src/apps/console/routes/_main+/$account+/settings+/_layout.tsx
+++ b/src/apps/console/routes/_main+/$account+/settings+/_layout.tsx
@@ -16,7 +16,7 @@ const Settings = () => {
         { label: 'User management', value: 'user-management' },
         // { label: 'Cloud providers', value: 'cloud-providers' },
         { label: 'Image pull secrets', value: 'image-pull-secrets' },
-        // { label: 'Image Discovery', value: 'images' },
+        { label: 'Image Discovery', value: 'images' },
         // { label: 'VPN', value: 'vpn' },
       ]}
       parentPath="/settings"
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 c3a6f851b..f5f369f1e 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
@@ -27,7 +27,7 @@ export const RegistryImageInstruction = ({
 
   return (
     <Popup.Root onOpenChange={onClose} show={show} className="!w-[800px]">
-      <Popup.Header>Instructions to add image on registry</Popup.Header>
+      <Popup.Header>Instructions to Add Image on registry</Popup.Header>
       <Popup.Content>
         <form className="flex flex-col gap-2xl">
           {error && (
@@ -41,7 +41,7 @@ export const RegistryImageInstruction = ({
             data && (
               <div className="flex flex-col gap-sm text-start ">
                 <span className="flex flex-wrap items-center gap-md py-lg">
-                  Please follow below instruction for further steps
+                  1. Using URL:
                 </span>
                 <CodeView
                   preClassName="!overflow-none text-wrap break-words"
@@ -49,6 +49,15 @@ export const RegistryImageInstruction = ({
                   data={data.url || ''}
                 />
 
+                <span className="flex flex-wrap items-center gap-md py-lg">
+                  2. Using Script URL:
+                </span>
+                <CodeView
+                  preClassName="!overflow-none text-wrap break-words"
+                  copy
+                  data={data.scriptUrl || ''}
+                />
+
                 {/* {data.url} */}
               </div>
             )
diff --git a/src/apps/console/server/gql/queries/byok-cluster-queries.ts b/src/apps/console/server/gql/queries/byok-cluster-queries.ts
index 06a97cda0..1717c814f 100644
--- a/src/apps/console/server/gql/queries/byok-cluster-queries.ts
+++ b/src/apps/console/server/gql/queries/byok-cluster-queries.ts
@@ -33,7 +33,7 @@ export const byokClusterQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleDeleteByokClusterMutation) =>
         data.infra_deleteBYOKCluster,
-      vars(_: ConsoleDeleteByokClusterMutationVariables) {},
+      vars(_: ConsoleDeleteByokClusterMutationVariables) { },
     }
   ),
   createBYOKCluster: executor(
@@ -47,7 +47,7 @@ export const byokClusterQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleCreateByokClusterMutation) =>
         data.infra_createBYOKCluster,
-      vars(_: ConsoleCreateByokClusterMutationVariables) {},
+      vars(_: ConsoleCreateByokClusterMutationVariables) { },
     }
   ),
   updateByokCluster: executor(
@@ -67,7 +67,7 @@ export const byokClusterQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleUpdateByokClusterMutation) =>
         data.infra_updateBYOKCluster,
-      vars(_: ConsoleUpdateByokClusterMutationVariables) {},
+      vars(_: ConsoleUpdateByokClusterMutationVariables) { },
     }
   ),
   getBYOKClusterInstructions: executor(
@@ -88,7 +88,7 @@ export const byokClusterQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleGetByokClusterInstructionsQuery) =>
         data.infrat_getBYOKClusterSetupInstructions,
-      vars(_: ConsoleGetByokClusterInstructionsQueryVariables) {},
+      vars(_: ConsoleGetByokClusterInstructionsQueryVariables) { },
     }
   ),
   getByokCluster: executor(
@@ -96,6 +96,7 @@ export const byokClusterQueries = (executor: IExecutor) => ({
       query Infra_getBYOKCluster($name: String!) {
         infra_getBYOKCluster(name: $name) {
           accountName
+          ownedBy
           createdBy {
             userEmail
             userId
@@ -137,7 +138,7 @@ export const byokClusterQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleGetByokClusterQuery) =>
         data.infra_getBYOKCluster,
-      vars(_: ConsoleGetByokClusterQueryVariables) {},
+      vars(_: ConsoleGetByokClusterQueryVariables) { },
     }
   ),
   listByokClusters: executor(
@@ -151,6 +152,7 @@ export const byokClusterQueries = (executor: IExecutor) => ({
             cursor
             node {
               accountName
+              ownedBy
               clusterSvcCIDR
               lastOnlineAt
               createdBy {
@@ -203,7 +205,7 @@ export const byokClusterQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleListByokClustersQuery) => {
         return data.infra_listBYOKClusters;
       },
-      vars(_: ConsoleListByokClustersQueryVariables) {},
+      vars(_: ConsoleListByokClustersQueryVariables) { },
     }
   ),
 });
diff --git a/src/apps/console/server/gql/queries/cluster-queries.ts b/src/apps/console/server/gql/queries/cluster-queries.ts
index 6f475b889..277d76fbb 100644
--- a/src/apps/console/server/gql/queries/cluster-queries.ts
+++ b/src/apps/console/server/gql/queries/cluster-queries.ts
@@ -11,16 +11,16 @@ import {
   ConsoleGetClusterQuery,
   ConsoleGetClusterQueryVariables,
   ConsoleGetKubeConfigQuery,
+  ConsoleListAllClustersQuery,
+  ConsoleListAllClustersQueryVariables,
   ConsoleListClustersQuery,
   ConsoleListClustersQueryVariables,
+  ConsoleListClusterStatusQuery,
+  ConsoleListClusterStatusQueryVariables,
   ConsoleListDnsHostsQuery,
+  ConsoleListDnsHostsQueryVariables,
   ConsoleUpdateClusterMutation,
   ConsoleUpdateClusterMutationVariables,
-  ConsoleListDnsHostsQueryVariables,
-  ConsoleListAllClustersQuery,
-  ConsoleListAllClustersQueryVariables,
-  ConsoleListClusterStatusQuery,
-  ConsoleListClusterStatusQueryVariables,
 } from '~/root/src/generated/gql/server';
 
 export type ICluster = NN<ConsoleGetClusterQuery['infra_getCluster']>;
@@ -54,8 +54,8 @@ export const clusterQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleListDnsHostsQuery) => {
         return data.infra_listClusters;
       },
-      vars(_: ConsoleListDnsHostsQueryVariables) {},
-    },
+      vars(_: ConsoleListDnsHostsQueryVariables) { },
+    }
   ),
 
   createCluster: executor(
@@ -69,8 +69,8 @@ export const clusterQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleCreateClusterMutation) =>
         data.infra_createCluster,
-      vars(_: ConsoleCreateClusterMutationVariables) {},
-    },
+      vars(_: ConsoleCreateClusterMutationVariables) { },
+    }
   ),
   deleteCluster: executor(
     gql`
@@ -81,8 +81,8 @@ export const clusterQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleDeleteClusterMutation) =>
         data.infra_deleteCluster,
-      vars(_: ConsoleDeleteClusterMutationVariables) {},
-    },
+      vars(_: ConsoleDeleteClusterMutationVariables) { },
+    }
   ),
   clustersCount: executor(
     gql`
@@ -94,8 +94,8 @@ export const clusterQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleClustersCountQuery) => data.infra_listClusters,
-      vars(_: ConsoleClustersCountQueryVariables) {},
-    },
+      vars(_: ConsoleClustersCountQueryVariables) { },
+    }
   ),
 
   listAllClusters: executor(
@@ -112,6 +112,7 @@ export const clusterQueries = (executor: IExecutor) => ({
             cursor
             node {
               accountName
+              ownedBy
               clusterSvcCIDR
               lastOnlineAt
               createdBy {
@@ -275,8 +276,8 @@ export const clusterQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleListAllClustersQuery) => data.byok_clusters,
-      vars(_: ConsoleListAllClustersQueryVariables) {},
-    },
+      vars(_: ConsoleListAllClustersQueryVariables) { },
+    }
   ),
   listClusters: executor(
     gql`
@@ -399,8 +400,8 @@ export const clusterQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleListClustersQuery) => data.infra_listClusters,
-      vars(_: ConsoleListClustersQueryVariables) {},
-    },
+      vars(_: ConsoleListClustersQueryVariables) { },
+    }
   ),
   getCluster: executor(
     gql`
@@ -505,8 +506,8 @@ export const clusterQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleGetClusterQuery) => data.infra_getCluster,
-      vars(_: ConsoleGetClusterQueryVariables) {},
-    },
+      vars(_: ConsoleGetClusterQueryVariables) { },
+    }
   ),
   listClusterStatus: executor(
     gql`
@@ -526,8 +527,8 @@ export const clusterQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleListClusterStatusQuery) =>
         data.infra_listBYOKClusters,
-      vars(_: ConsoleListClusterStatusQueryVariables) {},
-    },
+      vars(_: ConsoleListClusterStatusQueryVariables) { },
+    }
   ),
   getKubeConfig: executor(
     gql`
@@ -542,8 +543,8 @@ export const clusterQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleGetKubeConfigQuery) => data.infra_getCluster,
-      vars(_: ConsoleGetClusterQueryVariables) {},
-    },
+      vars(_: ConsoleGetClusterQueryVariables) { },
+    }
   ),
   updateCluster: executor(
     gql`
@@ -556,7 +557,7 @@ export const clusterQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleUpdateClusterMutation) =>
         data.infra_updateCluster,
-      vars(_: ConsoleUpdateClusterMutationVariables) {},
-    },
+      vars(_: ConsoleUpdateClusterMutationVariables) { },
+    }
   ),
 });
diff --git a/src/apps/console/server/gql/queries/pvc-queries.ts b/src/apps/console/server/gql/queries/pvc-queries.ts
index 0f25b56bb..d6bf7e445 100644
--- a/src/apps/console/server/gql/queries/pvc-queries.ts
+++ b/src/apps/console/server/gql/queries/pvc-queries.ts
@@ -41,9 +41,6 @@ export const pvcQueries = (executor: IExecutor) => ({
               namespace
             }
             resources {
-              claims {
-                name
-              }
               limits
               requests
             }
@@ -81,7 +78,7 @@ export const pvcQueries = (executor: IExecutor) => ({
       transformer(data: ConsoleGetPvcQuery) {
         return data.infra_getPVC;
       },
-      vars(_: ConsoleGetPvcQueryVariables) {},
+      vars(_: ConsoleGetPvcQueryVariables) { },
     }
   ),
   listPvcs: executor(
@@ -121,9 +118,6 @@ export const pvcQueries = (executor: IExecutor) => ({
                   namespace
                 }
                 resources {
-                  claims {
-                    name
-                  }
                   limits
                   requests
                 }
@@ -168,7 +162,7 @@ export const pvcQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleListPvcsQuery) => data.infra_listPVCs,
-      vars(_: ConsoleListPvcsQueryVariables) {},
+      vars(_: ConsoleListPvcsQueryVariables) { },
     }
   ),
 });
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 90c59a8bd..39004f5cd 100644
--- a/src/apps/console/server/gql/queries/registry-image-queries.ts
+++ b/src/apps/console/server/gql/queries/registry-image-queries.ts
@@ -10,6 +10,8 @@ import {
   ConsoleGetRegistryImageUrlQueryVariables,
   ConsoleListRegistryImagesQuery,
   ConsoleListRegistryImagesQueryVariables,
+  ConsoleSearchRegistryImagesQuery,
+  ConsoleSearchRegistryImagesQueryVariables,
 } from '~/root/src/generated/gql/server';
 
 export type IRegistryImages = NN<
@@ -29,7 +31,7 @@ export const registryImagesQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleDeleteRegistryImageMutation) =>
         data.core_deleteRegistryImage,
-      vars(_: ConsoleDeleteRegistryImageMutationVariables) {},
+      vars(_: ConsoleDeleteRegistryImageMutationVariables) { },
     }
   ),
   getRegistryImage: executor(
@@ -51,7 +53,7 @@ export const registryImagesQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleGetRegistryImageQuery) =>
         data.core_getRegistryImage,
-      vars(_: ConsoleGetRegistryImageQueryVariables) {},
+      vars(_: ConsoleGetRegistryImageQueryVariables) { },
     }
   ),
   getRegistryImageUrl: executor(
@@ -66,7 +68,30 @@ export const registryImagesQueries = (executor: IExecutor) => ({
     {
       transformer: (data: ConsoleGetRegistryImageUrlQuery) =>
         data.core_getRegistryImageURL,
-      vars(_: ConsoleGetRegistryImageUrlQueryVariables) {},
+      vars(_: ConsoleGetRegistryImageUrlQueryVariables) { },
+    }
+  ),
+  searchRegistryImages: executor(
+    gql`
+      query Core_searchRegistryImages($query: String!) {
+        core_searchRegistryImages(query: $query) {
+          accountName
+          creationTime
+          id
+          imageName
+          imageTag
+          markedForDeletion
+          meta
+          recordVersion
+          updateTime
+        }
+      }
+    `,
+    {
+      transformer: (data: ConsoleSearchRegistryImagesQuery) => {
+        return data.core_searchRegistryImages;
+      },
+      vars(_: ConsoleSearchRegistryImagesQueryVariables) { },
     }
   ),
   listRegistryImages: executor(
@@ -101,7 +126,7 @@ export const registryImagesQueries = (executor: IExecutor) => ({
       transformer: (data: ConsoleListRegistryImagesQuery) => {
         return data.core_listRegistryImages;
       },
-      vars(_: ConsoleListRegistryImagesQueryVariables) {},
+      vars(_: ConsoleListRegistryImagesQueryVariables) { },
     }
   ),
 });
diff --git a/src/apps/webinar/src/app/around/join/page.tsx b/src/apps/webinar/src/app/around/join/page.tsx
new file mode 100644
index 000000000..d980b82f5
--- /dev/null
+++ b/src/apps/webinar/src/app/around/join/page.tsx
@@ -0,0 +1,48 @@
+import axios from 'axios';
+//@ts-ignore
+import { cookies } from 'next/headers';
+import { redirect } from 'next/navigation';
+
+async function getUserDetails() {
+    const cookie = cookies().get("hotspot-session")
+
+    try {
+        const res = await axios({
+            url: `${process.env.AUTH_URL}/api` || 'https://auth.kloudlite.io/api',
+            method: 'post',
+            data: {
+                method: 'whoAmI',
+                args: [{}],
+            },
+            headers: {
+                'Content-Type': 'application/json; charset=utf-8',
+                connection: 'keep-alive',
+                cookie: 'hotspot-session=' + cookie?.value + ';',
+            },
+        });
+        if (!res.status) {
+            console.log("failed to get user details");
+        }
+        return res.data.data;
+
+    } catch (error) {
+        console.log("error", error);
+        return null;
+    }
+
+}
+
+
+export default async function Home(props: any) {
+    const callbackUrl = props.searchParams.aroundUrl || process.env.CALLBACK_URL;;
+    const redirectUrl = `${process.env.REDIRECT_URL}?callback=${callbackUrl}`;
+    const aroundUrl = process.env.AROUND_MEETING_URL || "";
+
+    const userDetails = await getUserDetails();
+
+    if (userDetails) {
+        redirect(aroundUrl);
+    }
+    redirect(redirectUrl);
+
+}
diff --git a/src/apps/webinar/src/app/components/join-webinar.tsx b/src/apps/webinar/src/app/components/join-webinar.tsx
index c332a14f3..6e097c1e5 100644
--- a/src/apps/webinar/src/app/components/join-webinar.tsx
+++ b/src/apps/webinar/src/app/components/join-webinar.tsx
@@ -2,7 +2,6 @@
 import { ArrowRightLg } from '@jengaicons/react';
 //@ts-ignore
 import { Button } from 'kl-design-system/atoms/button';
-import Link from 'next/link';
 import { useRouter } from "next/navigation";
 
 
@@ -23,21 +22,19 @@ export const JoinWebinar = ({ userData, meetingStatus, meetingId }: { userData:
     return (
         <div
             className='flex flex-col items-stretch gap-3xl'>
-            <Link href={`/pages/meeting?email=${userData.email}&name=${userData.name}&meetingId=${meetingId}`}>
-                <Button
-                    size="lg"
-                    variant="primary"
-                    content={<span className="bodyLg-medium">{meetingStatus === 'ACTIVE' ? 'Join' : 'Meeting is not active'}</span>}
-                    suffix={meetingStatus === 'ACTIVE' ? <ArrowRightLg /> : null}
-                    disabled={meetingStatus !== 'ACTIVE'}
-                    block
-                // onClick={() => {
-                //     // window.location.href = `/pages/meeting?email=${userData.email}&name=${userData.name}&meetingId=${process.env.NEXT_PUBLIC_DYTE_MEETING_ID}`
-                //     window.location.href = `/pages/meeting?email=${userData.email}&name=${userData.name}&meetingId=${meetingId}`
-                //     // router.push(`/pages/meeting?email=${userData.email}&name=${userData.name}&meetingId=${meetingId}`)
-                // }}
-                />
-            </Link>
+            {/* <Link href={`/pages/meeting?email=${userData.email}&name=${userData.name}&meetingId=${meetingId}`}> */}
+            <Button
+                size="lg"
+                variant="primary"
+                content={<span className="bodyLg-medium">{meetingStatus === 'ACTIVE' ? 'Join' : 'Meeting is not active'}</span>}
+                suffix={meetingStatus === 'ACTIVE' ? <ArrowRightLg /> : null}
+                disabled={meetingStatus !== 'ACTIVE'}
+                block
+                onClick={() => {
+                    window.location.href = `/pages/meeting?email=${userData.email}&name=${userData.name}&meetingId=${meetingId}`
+                }}
+            />
+            {/* </Link> */}
         </div>
     )
 }
diff --git a/src/apps/webinar/src/app/page.tsx b/src/apps/webinar/src/app/page.tsx
index 23dc5190d..19bc10867 100644
--- a/src/apps/webinar/src/app/page.tsx
+++ b/src/apps/webinar/src/app/page.tsx
@@ -4,15 +4,8 @@ import { cookies } from 'next/headers';
 import { redirect } from 'next/navigation';
 import { WebinarUI } from './orgs/webinar-ui';
 
-
-export default async function Home(props: any) {
-
+async function getUserDetails() {
   const cookie = cookies().get("hotspot-session")
-  const callbackUrl = props.searchParams.eventHashUrl || process.env.CALLBACK_URL;
-  const redirectUrl = `${process.env.REDIRECT_URL}?callback=${callbackUrl}`;
-  const token = btoa(`${process.env.DYTE_ORG_ID}:${process.env.DYTE_API_KEY}`);
-
-  console.log("props", props.searchParams.eventHashUrl)
 
   try {
     const res = await axios({
@@ -28,7 +21,22 @@ export default async function Home(props: any) {
         cookie: 'hotspot-session=' + cookie?.value + ';',
       },
     });
+    if (!res.status) {
+      console.log("failed to get user details");
+    }
+    return res.data.data;
+
+  } catch (error) {
+    console.log("error", error);
+    return null;
+  }
+
+}
+
+async function getMeetingDetails() {
+  const token = btoa(`${process.env.DYTE_ORG_ID}:${process.env.DYTE_API_KEY}`);
 
+  try {
     const {
       data: { success, data },
     } = await axios.get(
@@ -39,20 +47,32 @@ export default async function Home(props: any) {
         },
       },
     );
+
     if (!success) {
-      throw new Error('Failed to get meeting details');
+      console.log("failed to get meeting details");
     }
+    return data;
+  } catch (error) {
+    console.log("error", error);
+    return null;
+  }
+}
 
-    const userDetails = res.data.data;
-    if (userDetails) {
-      return (
-        <main className="flex flex-col h-full">
-          <WebinarUI userDetails={userDetails} meetingStatus={data.status} />
-        </main>
-      );
-    }
-    redirect(redirectUrl);
-  } catch (e) {
-    redirect(redirectUrl);
+
+export default async function Home() {
+  const callbackUrl = process.env.CALLBACK_URL;
+  const redirectUrl = `${process.env.REDIRECT_URL}?callback=${callbackUrl}`;
+
+  const userDetails = await getUserDetails();
+  const meetingDetails = await getMeetingDetails();
+
+  if (userDetails) {
+    return (
+      <main className="flex flex-col h-full">
+        <WebinarUI userDetails={userDetails} meetingStatus={meetingDetails.status} />
+      </main>
+    );
   }
+  redirect(redirectUrl);
+
 }
diff --git a/src/apps/webinar/src/app/pages/meeting/page.tsx b/src/apps/webinar/src/app/pages/meeting/page.tsx
index a91856bd4..cddf37190 100644
--- a/src/apps/webinar/src/app/pages/meeting/page.tsx
+++ b/src/apps/webinar/src/app/pages/meeting/page.tsx
@@ -1,15 +1,18 @@
+//@ts-ignore
+import { cookies } from 'next/headers';
 import { Suspense } from 'react';
 import { Meeting } from "./components/meeting";
 
 export default async function App() {
-
-    const dyteOrgId = process.env.DYTE_ORG_ID || "";
-    const dyteApiKey = process.env.DYTE_API_KEY || "";
-
+    // NOTE: cookie is defining here just because to get environment variables,
+    // as next js is not allowing to access environment variables in server side if we will not make server call.
+    const cookie = cookies().get("hotspot-session")
 
     return (
         <Suspense>
-            <Meeting dyteOrgId={dyteOrgId} dyteApiKey={dyteApiKey} />
+            <Meeting dyteOrgId={process.env.DYTE_ORG_ID || ""} dyteApiKey={process.env.DYTE_API_KEY || ""} />
         </Suspense>
     );
+
 }
+
diff --git a/src/generated/gql/sdl.graphql b/src/generated/gql/sdl.graphql
index 5e339025b..a5cf64b5f 100644
--- a/src/generated/gql/sdl.graphql
+++ b/src/generated/gql/sdl.graphql
@@ -196,6 +196,7 @@ type BYOKCluster {
   markedForDeletion: Boolean
   messageQueueTopicName: String!
   metadata: Metadata!
+  ownedBy: String
   recordVersion: Int!
   syncStatus: Github__com___kloudlite___api___pkg___types__SyncStatus!
   updateTime: Date!
@@ -210,6 +211,7 @@ type BYOKClusterEdge {
 input BYOKClusterIn {
   displayName: String!
   metadata: MetadataIn!
+  ownedBy: String
   visibility: Github__com___kloudlite___api___apps___infra___internal___entities__ClusterVisbilityIn!
 }
 
@@ -289,6 +291,7 @@ type Cluster {
   lastUpdatedBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy!
   markedForDeletion: Boolean
   metadata: Metadata!
+  ownedBy: String
   recordVersion: Int!
   spec: Github__com___kloudlite___operator___apis___clusters___v1__ClusterSpec!
   status: Github__com___kloudlite___operator___pkg___operator__Status
@@ -307,6 +310,7 @@ input ClusterIn {
   globalVPN: String
   kind: String
   metadata: MetadataIn!
+  ownedBy: String
   spec: Github__com___kloudlite___operator___apis___clusters___v1__ClusterSpecIn!
 }
 
@@ -903,6 +907,11 @@ enum Github__com___kloudlite___api___apps___infra___internal___entities__Cluster
   public
 }
 
+type Github__com___kloudlite___api___apps___infra___internal___entities__DispatchAddr {
+  accountName: String!
+  clusterName: String!
+}
+
 type Github__com___kloudlite___api___apps___infra___internal___entities__GCPSecretCredentials {
   serviceAccountJSON: String!
 }
@@ -2136,6 +2145,7 @@ type HelmRelease {
   clusterName: String!
   createdBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy!
   creationTime: Date!
+  dispatchAddr: Github__com___kloudlite___api___apps___infra___internal___entities__DispatchAddr
   displayName: String!
   id: ID!
   kind: String
@@ -2727,6 +2737,16 @@ input K8s__io___api___core___v1__LocalVolumeSourceIn {
   path: String!
 }
 
+type K8s__io___api___core___v1__ModifyVolumeStatus {
+  status: K8s__io___api___core___v1__PersistentVolumeClaimModifyVolumeStatus!
+  targetVolumeAttributesClassName: String
+}
+
+input K8s__io___api___core___v1__ModifyVolumeStatusIn {
+  status: K8s__io___api___core___v1__PersistentVolumeClaimModifyVolumeStatus!
+  targetVolumeAttributesClassName: String
+}
+
 type K8s__io___api___core___v1__NamespaceCondition {
   lastTransitionTime: Date
   message: String
@@ -2875,9 +2895,17 @@ input K8s__io___api___core___v1__PersistentVolumeClaimConditionIn {
 
 enum K8s__io___api___core___v1__PersistentVolumeClaimConditionType {
   FileSystemResizePending
+  ModifyingVolume
+  ModifyVolumeError
   Resizing
 }
 
+enum K8s__io___api___core___v1__PersistentVolumeClaimModifyVolumeStatus {
+  Infeasible
+  InProgress
+  Pending
+}
+
 enum K8s__io___api___core___v1__PersistentVolumeClaimPhase {
   Bound
   Lost
@@ -2888,9 +2916,10 @@ type K8s__io___api___core___v1__PersistentVolumeClaimSpec {
   accessModes: [String!]
   dataSource: K8s__io___api___core___v1__TypedLocalObjectReference
   dataSourceRef: K8s__io___api___core___v1__TypedObjectReference
-  resources: K8s__io___api___core___v1__ResourceRequirements
+  resources: K8s__io___api___core___v1__VolumeResourceRequirements
   selector: K8s__io___apimachinery___pkg___apis___meta___v1__LabelSelector
   storageClassName: String
+  volumeAttributesClassName: String
   volumeMode: String
   volumeName: String
 }
@@ -2899,9 +2928,10 @@ input K8s__io___api___core___v1__PersistentVolumeClaimSpecIn {
   accessModes: [String!]
   dataSource: K8s__io___api___core___v1__TypedLocalObjectReferenceIn
   dataSourceRef: K8s__io___api___core___v1__TypedObjectReferenceIn
-  resources: K8s__io___api___core___v1__ResourceRequirementsIn
+  resources: K8s__io___api___core___v1__VolumeResourceRequirementsIn
   selector: K8s__io___apimachinery___pkg___apis___meta___v1__LabelSelectorIn
   storageClassName: String
+  volumeAttributesClassName: String
   volumeMode: String
   volumeName: String
 }
@@ -2912,6 +2942,8 @@ type K8s__io___api___core___v1__PersistentVolumeClaimStatus {
   allocatedResourceStatuses: Map
   capacity: Map
   conditions: [K8s__io___api___core___v1__PersistentVolumeClaimCondition!]
+  currentVolumeAttributesClassName: String
+  modifyVolumeStatus: K8s__io___api___core___v1__ModifyVolumeStatus
   phase: K8s__io___api___core___v1__PersistentVolumeClaimPhase
 }
 
@@ -2921,6 +2953,8 @@ input K8s__io___api___core___v1__PersistentVolumeClaimStatusIn {
   allocatedResourceStatuses: Map
   capacity: Map
   conditions: [K8s__io___api___core___v1__PersistentVolumeClaimConditionIn!]
+  currentVolumeAttributesClassName: String
+  modifyVolumeStatus: K8s__io___api___core___v1__ModifyVolumeStatusIn
   phase: K8s__io___api___core___v1__PersistentVolumeClaimPhase
 }
 
@@ -2967,6 +3001,7 @@ type K8s__io___api___core___v1__PersistentVolumeSpec {
   scaleIO: K8s__io___api___core___v1__ScaleIOPersistentVolumeSource
   storageClassName: String
   storageos: K8s__io___api___core___v1__StorageOSPersistentVolumeSource
+  volumeAttributesClassName: String
   volumeMode: String
   vsphereVolume: K8s__io___api___core___v1__VsphereVirtualDiskVolumeSource
 }
@@ -3000,6 +3035,7 @@ input K8s__io___api___core___v1__PersistentVolumeSpecIn {
   scaleIO: K8s__io___api___core___v1__ScaleIOPersistentVolumeSourceIn
   storageClassName: String
   storageos: K8s__io___api___core___v1__StorageOSPersistentVolumeSourceIn
+  volumeAttributesClassName: String
   volumeMode: String
   vsphereVolume: K8s__io___api___core___v1__VsphereVirtualDiskVolumeSourceIn
 }
@@ -3040,6 +3076,8 @@ input K8s__io___api___core___v1__PodAffinityIn {
 
 type K8s__io___api___core___v1__PodAffinityTerm {
   labelSelector: K8s__io___apimachinery___pkg___apis___meta___v1__LabelSelector
+  matchLabelKeys: [String!]
+  mismatchLabelKeys: [String!]
   namespaces: [String!]
   namespaceSelector: K8s__io___apimachinery___pkg___apis___meta___v1__LabelSelector
   topologyKey: String!
@@ -3047,6 +3085,8 @@ type K8s__io___api___core___v1__PodAffinityTerm {
 
 input K8s__io___api___core___v1__PodAffinityTermIn {
   labelSelector: K8s__io___apimachinery___pkg___apis___meta___v1__LabelSelectorIn
+  matchLabelKeys: [String!]
+  mismatchLabelKeys: [String!]
   namespaces: [String!]
   namespaceSelector: K8s__io___apimachinery___pkg___apis___meta___v1__LabelSelectorIn
   topologyKey: String!
@@ -3124,26 +3164,6 @@ input K8s__io___api___core___v1__RBDPersistentVolumeSourceIn {
   user: String
 }
 
-type K8s__io___api___core___v1__ResourceClaim {
-  name: String!
-}
-
-input K8s__io___api___core___v1__ResourceClaimIn {
-  name: String!
-}
-
-type K8s__io___api___core___v1__ResourceRequirements {
-  claims: [K8s__io___api___core___v1__ResourceClaim!]
-  limits: Map
-  requests: Map
-}
-
-input K8s__io___api___core___v1__ResourceRequirementsIn {
-  claims: [K8s__io___api___core___v1__ResourceClaimIn!]
-  limits: Map
-  requests: Map
-}
-
 type K8s__io___api___core___v1__ScaleIOPersistentVolumeSource {
   fsType: String
   gateway: String!
@@ -3319,6 +3339,16 @@ input K8s__io___api___core___v1__VolumeNodeAffinityIn {
   required: K8s__io___api___core___v1__NodeSelectorIn
 }
 
+type K8s__io___api___core___v1__VolumeResourceRequirements {
+  limits: Map
+  requests: Map
+}
+
+input K8s__io___api___core___v1__VolumeResourceRequirementsIn {
+  limits: Map
+  requests: Map
+}
+
 type K8s__io___api___core___v1__VsphereVirtualDiskVolumeSource {
   fsType: String
   storagePolicyID: String
@@ -3740,6 +3770,7 @@ type NodePool {
   clusterName: String!
   createdBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy!
   creationTime: Date!
+  dispatchAddr: Github__com___kloudlite___api___apps___infra___internal___entities__DispatchAddr
   displayName: String!
   id: ID!
   kind: String
@@ -3949,6 +3980,7 @@ type Query {
   core_getApp(envName: String!, name: String!): App
   core_getConfig(envName: String!, name: String!): Config
   core_getConfigValues(envName: String!, queries: [ConfigKeyRefIn]): [ConfigKeyValueRef!]
+  core_getDNSHostSuffix: String!
   core_getEnvironment(name: String!): Environment
   core_getExternalApp(envName: String!, name: String!): ExternalApp
   core_getImagePullSecret(name: String!): ImagePullSecret
@@ -3979,6 +4011,7 @@ type Query {
   core_resyncManagedResource(msvcName: String!, name: String!): Boolean!
   core_resyncRouter(envName: String!, name: String!): Boolean!
   core_resyncSecret(envName: String!, name: String!): Boolean!
+  core_searchRegistryImages(query: String!): [RegistryImage!]!
   cr_checkUserNameAvailability(name: String!): CRCheckNameAvailabilityOutput!
   cr_getBuild(id: ID!): Build
   cr_getBuildRun(buildID: ID!, buildRunName: String!): BuildRun
diff --git a/src/generated/gql/server.ts b/src/generated/gql/server.ts
index 892312215..3531eca04 100644
--- a/src/generated/gql/server.ts
+++ b/src/generated/gql/server.ts
@@ -314,8 +314,13 @@ export type K8s__Io___Api___Core___V1__PersistentVolumePhase =
 
 export type K8s__Io___Api___Core___V1__PersistentVolumeClaimConditionType =
   | 'FileSystemResizePending'
+  | 'ModifyingVolume'
+  | 'ModifyVolumeError'
   | 'Resizing';
 
+export type K8s__Io___Api___Core___V1__PersistentVolumeClaimModifyVolumeStatus =
+  'Infeasible' | 'InProgress' | 'Pending';
+
 export type K8s__Io___Api___Core___V1__PersistentVolumeClaimPhase =
   | 'Bound'
   | 'Lost'
@@ -931,6 +936,7 @@ export type RepositoryIn = {
 export type ByokClusterIn = {
   displayName: Scalars['String']['input'];
   metadata: MetadataIn;
+  ownedBy?: InputMaybe<Scalars['String']['input']>;
   visibility: Github__Com___Kloudlite___Api___Apps___Infra___Internal___Entities__ClusterVisbilityIn;
 };
 
@@ -945,6 +951,7 @@ export type ClusterIn = {
   globalVPN?: InputMaybe<Scalars['String']['input']>;
   kind?: InputMaybe<Scalars['String']['input']>;
   metadata: MetadataIn;
+  ownedBy?: InputMaybe<Scalars['String']['input']>;
   spec: Github__Com___Kloudlite___Operator___Apis___Clusters___V1__ClusterSpecIn;
 };
 
@@ -1122,6 +1129,8 @@ export type K8s__Io___Api___Core___V1__WeightedPodAffinityTermIn = {
 
 export type K8s__Io___Api___Core___V1__PodAffinityTermIn = {
   labelSelector?: InputMaybe<K8s__Io___Apimachinery___Pkg___Apis___Meta___V1__LabelSelectorIn>;
+  matchLabelKeys?: InputMaybe<Array<Scalars['String']['input']>>;
+  mismatchLabelKeys?: InputMaybe<Array<Scalars['String']['input']>>;
   namespaces?: InputMaybe<Array<Scalars['String']['input']>>;
   namespaceSelector?: InputMaybe<K8s__Io___Apimachinery___Pkg___Apis___Meta___V1__LabelSelectorIn>;
   topologyKey: Scalars['String']['input'];
@@ -1497,6 +1506,11 @@ export type K8s__Io___Api___Core___V1__LocalVolumeSourceIn = {
   path: Scalars['String']['input'];
 };
 
+export type K8s__Io___Api___Core___V1__ModifyVolumeStatusIn = {
+  status: K8s__Io___Api___Core___V1__PersistentVolumeClaimModifyVolumeStatus;
+  targetVolumeAttributesClassName?: InputMaybe<Scalars['String']['input']>;
+};
+
 export type K8s__Io___Api___Core___V1__NamespaceConditionIn = {
   lastTransitionTime?: InputMaybe<Scalars['Date']['input']>;
   message?: InputMaybe<Scalars['String']['input']>;
@@ -1545,9 +1559,10 @@ export type K8s__Io___Api___Core___V1__PersistentVolumeClaimSpecIn = {
   accessModes?: InputMaybe<Array<Scalars['String']['input']>>;
   dataSource?: InputMaybe<K8s__Io___Api___Core___V1__TypedLocalObjectReferenceIn>;
   dataSourceRef?: InputMaybe<K8s__Io___Api___Core___V1__TypedObjectReferenceIn>;
-  resources?: InputMaybe<K8s__Io___Api___Core___V1__ResourceRequirementsIn>;
+  resources?: InputMaybe<K8s__Io___Api___Core___V1__VolumeResourceRequirementsIn>;
   selector?: InputMaybe<K8s__Io___Apimachinery___Pkg___Apis___Meta___V1__LabelSelectorIn>;
   storageClassName?: InputMaybe<Scalars['String']['input']>;
+  volumeAttributesClassName?: InputMaybe<Scalars['String']['input']>;
   volumeMode?: InputMaybe<Scalars['String']['input']>;
   volumeName?: InputMaybe<Scalars['String']['input']>;
 };
@@ -1565,16 +1580,11 @@ export type K8s__Io___Api___Core___V1__TypedObjectReferenceIn = {
   namespace?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type K8s__Io___Api___Core___V1__ResourceRequirementsIn = {
-  claims?: InputMaybe<Array<K8s__Io___Api___Core___V1__ResourceClaimIn>>;
+export type K8s__Io___Api___Core___V1__VolumeResourceRequirementsIn = {
   limits?: InputMaybe<Scalars['Map']['input']>;
   requests?: InputMaybe<Scalars['Map']['input']>;
 };
 
-export type K8s__Io___Api___Core___V1__ResourceClaimIn = {
-  name: Scalars['String']['input'];
-};
-
 export type K8s__Io___Api___Core___V1__PersistentVolumeClaimStatusIn = {
   accessModes?: InputMaybe<Array<Scalars['String']['input']>>;
   allocatedResources?: InputMaybe<Scalars['Map']['input']>;
@@ -1583,6 +1593,8 @@ export type K8s__Io___Api___Core___V1__PersistentVolumeClaimStatusIn = {
   conditions?: InputMaybe<
     Array<K8s__Io___Api___Core___V1__PersistentVolumeClaimConditionIn>
   >;
+  currentVolumeAttributesClassName?: InputMaybe<Scalars['String']['input']>;
+  modifyVolumeStatus?: InputMaybe<K8s__Io___Api___Core___V1__ModifyVolumeStatusIn>;
   phase?: InputMaybe<K8s__Io___Api___Core___V1__PersistentVolumeClaimPhase>;
 };
 
@@ -1615,6 +1627,7 @@ export type K8s__Io___Api___Core___V1__PersistentVolumeSpecIn = {
   scaleIO?: InputMaybe<K8s__Io___Api___Core___V1__ScaleIoPersistentVolumeSourceIn>;
   storageClassName?: InputMaybe<Scalars['String']['input']>;
   storageos?: InputMaybe<K8s__Io___Api___Core___V1__StorageOsPersistentVolumeSourceIn>;
+  volumeAttributesClassName?: InputMaybe<Scalars['String']['input']>;
   volumeMode?: InputMaybe<Scalars['String']['input']>;
   vsphereVolume?: InputMaybe<K8s__Io___Api___Core___V1__VsphereVirtualDiskVolumeSourceIn>;
 };
@@ -1968,6 +1981,7 @@ export type ConsoleListAllClustersQuery = {
       cursor: string;
       node: {
         accountName: string;
+        ownedBy?: string;
         clusterSvcCIDR: string;
         lastOnlineAt?: any;
         creationTime: any;
@@ -4186,11 +4200,7 @@ export type ConsoleGetPvcQuery = {
         name: string;
         namespace?: string;
       };
-      resources?: {
-        limits?: any;
-        requests?: any;
-        claims?: Array<{ name: string }>;
-      };
+      resources?: { limits?: any; requests?: any };
       selector?: {
         matchLabels?: any;
         matchExpressions?: Array<{
@@ -4254,11 +4264,7 @@ export type ConsoleListPvcsQuery = {
             name: string;
             namespace?: string;
           };
-          resources?: {
-            limits?: any;
-            requests?: any;
-            claims?: Array<{ name: string }>;
-          };
+          resources?: { limits?: any; requests?: any };
           selector?: {
             matchLabels?: any;
             matchExpressions?: Array<{
@@ -5051,6 +5057,7 @@ export type ConsoleGetByokClusterQueryVariables = Exact<{
 export type ConsoleGetByokClusterQuery = {
   infra_getBYOKCluster?: {
     accountName: string;
+    ownedBy?: string;
     creationTime: any;
     displayName: string;
     id: string;
@@ -5093,6 +5100,7 @@ export type ConsoleListByokClustersQuery = {
       cursor: string;
       node: {
         accountName: string;
+        ownedBy?: string;
         clusterSvcCIDR: string;
         lastOnlineAt?: any;
         creationTime: any;
@@ -6121,6 +6129,24 @@ export type ConsoleGetRegistryImageUrlQuery = {
   core_getRegistryImageURL: { scriptUrl: string; url: string };
 };
 
+export type ConsoleSearchRegistryImagesQueryVariables = Exact<{
+  query: Scalars['String']['input'];
+}>;
+
+export type ConsoleSearchRegistryImagesQuery = {
+  core_searchRegistryImages: Array<{
+    accountName: string;
+    creationTime: any;
+    id: string;
+    imageName: string;
+    imageTag: string;
+    markedForDeletion?: boolean;
+    meta: any;
+    recordVersion: number;
+    updateTime: any;
+  }>;
+};
+
 export type ConsoleListRegistryImagesQueryVariables = Exact<{
   pq?: InputMaybe<CursorPaginationIn>;
 }>;