diff --git a/jest.config.ts b/jest.config.ts
index c0cafe8..6fe08a7 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -13,7 +13,6 @@ const config: Config.InitialOptions = {
     '@shell/(.*)': '<rootDir>/node_modules/@rancher/shell/$1',
     '@components/(.*)':
       '<rootDir>/node_modules/@rancher/components/dist/@rancher/components.common.js',
-    '@benchmark-compliance/(.*)': '<rootDir>/pkg/benchmark-compliance/$1',
     '@sbombastic-image-vulnerability-scanner/(.*)': '<rootDir>/pkg/sbombastic-image-vulnerability-scanner/$1',
     '@network/(.*)': '<rootDir>/pkg/network/$1',
     '@runtime-process-profile/(.*)': '<rootDir>/pkg/runtime-process-profile/$1',
diff --git a/pkg/benchmark-compliance/babel.config.js b/pkg/benchmark-compliance/babel.config.js
deleted file mode 100644
index 410af81..0000000
--- a/pkg/benchmark-compliance/babel.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./.shell/pkg/babel.config.js');
diff --git a/pkg/benchmark-compliance/index.ts b/pkg/benchmark-compliance/index.ts
deleted file mode 100644
index d1453cd..0000000
--- a/pkg/benchmark-compliance/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { importTypes } from '@rancher/auto-import';
-import { IPlugin } from '@shell/core/types';
-import benchmarkRoutes from './routes/benchmark-routes';
-
-// Init the package
-export default function(plugin: IPlugin): void {
-  // Auto-import model, detail, edit from the folders
-  importTypes(plugin);
-
-  // Provide plugin metadata from package.json
-  plugin.metadata = require('./package.json');
-
-  // Load a product
-  plugin.addProduct(require('./product'));
-
-  // Add Vue Routes
-  plugin.addRoutes(benchmarkRoutes);
-}
diff --git a/pkg/benchmark-compliance/l10n/en-us.yaml b/pkg/benchmark-compliance/l10n/en-us.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/pkg/benchmark-compliance/package.json b/pkg/benchmark-compliance/package.json
deleted file mode 100644
index 4b398a3..0000000
--- a/pkg/benchmark-compliance/package.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "benchmark-compliance",
-  "description": "benchmark-compliance plugin",
-  "version": "0.1.0",
-  "private": false,
-  "rancher": {
-    "annotations": {
-      "catalog.cattle.io/rancher-version": ">= 2.10.0",
-      "catalog.cattle.io/ui-extensions-version": ">= 3.0.0 < 4.0.0"
-    }
-  },
-  "scripts": {},
-  "engines": {
-    "node": ">=16"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~5.0.0",
-    "@vue/cli-service": "~5.0.0",
-    "@vue/cli-plugin-typescript": "~5.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
-}
\ No newline at end of file
diff --git a/pkg/benchmark-compliance/pages/overview.vue b/pkg/benchmark-compliance/pages/overview.vue
deleted file mode 100644
index ed763a7..0000000
--- a/pkg/benchmark-compliance/pages/overview.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <div class="page">
-    <h2>{{ content }}</h2>
-  </div>
-
-
-</template>
-
-<script lang="ts">
-
-  export default {
-    name: 'overview',
-  }
-</script>
-
-<script lang="ts" setup>
-  import { ref } from "vue";
-
-  let content = ref("Benchmark Compliance");
-
-</script>
-
-<style scoped>
-  .page {
-    display: flex;
-    flex-direction: column;
-    padding: 20px;
-    min-height: 100%;
-  }
-
-</style>
\ No newline at end of file
diff --git a/pkg/benchmark-compliance/product.ts b/pkg/benchmark-compliance/product.ts
deleted file mode 100644
index 3d1f7f3..0000000
--- a/pkg/benchmark-compliance/product.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { IPlugin } from '@shell/core/types';
-
-export function init($plugin: IPlugin, store: any) {
-    const productName = 'benchmark';
-
-    const {
-        product,
-        virtualType,
-        basicType
-    } = $plugin.DSL(store, productName);
-
-    // registering a top-level product
-    product({
-        icon: 'pod_security',
-        inStore: 'cluster',
-    });
-
-    // => => => creating a custom page
-    virtualType({
-        label: 'Overview',
-        name:   'overview',
-        namespaced: false,
-        route:    {
-            name:   `c-cluster-${productName}-overview`,
-            params: {
-                product: productName
-            },
-            meta: { pkg: "benchmark-compliance", product: productName }
-        }
-    });
-
-    basicType([
-        "overview"
-    ]);
-}
\ No newline at end of file
diff --git a/pkg/benchmark-compliance/routes/benchmark-routes.ts b/pkg/benchmark-compliance/routes/benchmark-routes.ts
deleted file mode 100644
index b343961..0000000
--- a/pkg/benchmark-compliance/routes/benchmark-routes.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import Overview from '../pages/overview.vue'
-
-const benchmarkName = 'benchmark';
-const routes = [
-  {
-    name: `c-cluster-${ benchmarkName }-overview`,
-    path: `/c/:cluster/${ benchmarkName }/overview`,
-    component: Overview
-  }
-]
-
-export default routes;
\ No newline at end of file
diff --git a/pkg/benchmark-compliance/tsconfig.json b/pkg/benchmark-compliance/tsconfig.json
deleted file mode 100644
index 184a0f7..0000000
--- a/pkg/benchmark-compliance/tsconfig.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "compilerOptions": {
-    "allowJs": true,
-    "target": "esnext",
-    "module": "esnext",
-    "strict": true,
-    "jsx": "preserve",
-    "importHelpers": true,
-    "moduleResolution": "node",
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "preserveSymlinks": true,
-    "typeRoots": [
-      "../../node_modules",
-      "../../node_modules/@rancher/shell/types"
-    ],    
-    "types": [
-      "node",
-      "webpack-env",
-      "@types/node",
-      "@types/jest",
-      "@types/lodash",
-      "rancher",
-      "shell",
-      "jest"
-    ],
-    "lib": [
-      "esnext",
-      "dom",
-      "dom.iterable",
-      "scripthost"
-    ],
-    "paths": {
-      "@shell/*": [
-        "../../node_modules/@rancher/shell/*"
-      ],
-      "@components/*": [
-        "@rancher/components/*"
-      ],
-      "@benchmark-compliance/*": ["./*"],
-      "@tests/*": ["./tests/*"]
-    }
-  },
-  "include": [
-    "**/*.ts",
-    "**/*.d.ts",
-    "**/*.tsx",
-    "**/*.vue"
-  ],
-  "exclude": ["node_modules", "**/*.spec.ts", "**/*.test.ts"]
-}
diff --git a/pkg/benchmark-compliance/vue.config.js b/pkg/benchmark-compliance/vue.config.js
deleted file mode 100644
index ee5e91e..0000000
--- a/pkg/benchmark-compliance/vue.config.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const vendorConfigFactory = require('./.shell/pkg/vue.config');
-
-module.exports = () => {
-  const vendorConfig =
-    typeof vendorConfigFactory === 'function' ? vendorConfigFactory(__dirname) : vendorConfigFactory;
-
-  // Wrap the vendor configureWebpack if it exists.
-  const vendorConfigureWebpack = vendorConfig.configureWebpack;
-  const customConfigureWebpack = (config) => {
-    if (typeof vendorConfigureWebpack === 'function') {
-      vendorConfigureWebpack(config);
-    }
-    // Add the @benchmark-compliance alias to point to the pkg/benchmark-compliance directory.
-    config.resolve.alias['@benchmark-compliance'] = path.resolve(__dirname);
-  };
-
-  // Create an override for __tests__ directories.
-  const kwChainWebpack = (config) => {
-    config.plugin('ignore-tests')
-      .use(webpack.IgnorePlugin, [{ resourceRegExp: /[\\/]__tests__[\\/]/ }]);
-  };
-
-  const mergedChainWebpack = (config) => {
-    if (typeof vendorConfig.chainWebpack === 'function') {
-      vendorConfig.chainWebpack(config);
-    }
-    kwChainWebpack(config);
-  };
-
-  // Merge our custom chainWebpack and configureWebpack with the vendor config.
-  return Object.assign({}, vendorConfig, {
-    chainWebpack:     mergedChainWebpack,
-    configureWebpack: customConfigureWebpack,
-  });
-};
diff --git a/pkg/network/tsconfig.json b/pkg/network/tsconfig.json
index 184a0f7..ab93138 100644
--- a/pkg/network/tsconfig.json
+++ b/pkg/network/tsconfig.json
@@ -40,7 +40,6 @@
       "@components/*": [
         "@rancher/components/*"
       ],
-      "@benchmark-compliance/*": ["./*"],
       "@tests/*": ["./tests/*"]
     }
   },
diff --git a/pkg/runtime-process-profile/tsconfig.json b/pkg/runtime-process-profile/tsconfig.json
index 184a0f7..ab93138 100644
--- a/pkg/runtime-process-profile/tsconfig.json
+++ b/pkg/runtime-process-profile/tsconfig.json
@@ -40,7 +40,6 @@
       "@components/*": [
         "@rancher/components/*"
       ],
-      "@benchmark-compliance/*": ["./*"],
       "@tests/*": ["./tests/*"]
     }
   },
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/common/RegistryStatusUpdate.vue b/pkg/sbombastic-image-vulnerability-scanner/components/common/RegistryStatusUpdate.vue
index 5e49238..cf19398 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/common/RegistryStatusUpdate.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/common/RegistryStatusUpdate.vue
@@ -1,7 +1,7 @@
 <template>
-    <div v-if="registryStatus.scan_name" class="registry-status-record">
-        <RouterLink class="scan-name" :to="`/c/${this.$route.params.cluster}/${ this.PRODUCT_NAME }/${ this.PAGE.REGISTRIES }/${ registryStatus.namespace }/${ registryStatus.scan_name }`">{{ registryStatus.scan_name }}</RouterLink>
-        <div class="registry-name">{{ registryStatus.registry_name }}</div>
+    <div v-if="registryStatus.registry_name" class="registry-status-record">
+        <RouterLink class="registry-name" :to="`/c/${this.$route.params.cluster}/${ this.PRODUCT_NAME }/${ this.PAGE.REGISTRIES }/${ registryStatus.namespace }/${ registryStatus.registry_name }`">{{ registryStatus.registry_name }}</RouterLink>
+        <div class="uri">{{ registryStatus.uri }}</div>
         <div class="prev-status"><RegisterStatusBadge :status="registryStatus.prev_status"/></div>
         <div class="arrow"></div>
         <div  class="curr-status"><RegisterStatusBadge :status="registryStatus.curr_status"/></div>
@@ -60,7 +60,7 @@
         padding: 4px 0px;
         align-items: center;
         align-self: stretch;
-        .scan-name {
+        .registry-name {
             display: -webkit-box;
             -webkit-box-orient: vertical;
             -webkit-line-clamp: 1;
@@ -74,7 +74,7 @@
             font-weight: 400;
             line-height: 21px;
         }
-        .registry-name {
+        .uri {
             display: -webkit-box;
             -webkit-box-orient: vertical;
             -webkit-line-clamp: 1;
@@ -82,11 +82,13 @@
             overflow: hidden;
             color: #141419;
             text-overflow: ellipsis;
+            word-break: break-all;
             font-family: Lato;
             font-size: 14px;
             font-style: normal;
             font-weight: 400;
             line-height: 21px;
+            margin-right: 8px;
         }
         .prev-status { 
             flex: 5;
diff --git a/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts b/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts
index bfce941..cb4f40a 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts
@@ -13,19 +13,6 @@ export function init($plugin: IPlugin, store: any) {
       inStore: "cluster",
   });
 
-  virtualType({
-      labelKey: 'imageScanner.registries.title',
-      name: PAGE.REGISTRIES,
-      namespaced: false,
-      route:    {
-          name:   `c-cluster-${PRODUCT_NAME}-${PAGE.REGISTRIES}`,
-          params: {
-              product: PRODUCT_NAME
-          },
-          meta: { pkg: PRODUCT_NAME, product: PRODUCT_NAME }
-      }
-  });
-
   virtualType({
     labelKey: 'imageScanner.images.title',
     name: PAGE.IMAGE_OVERVIEW,
@@ -70,6 +57,6 @@ export function init($plugin: IPlugin, store: any) {
         PAGE.VULNERABILITY_OVERVIEW,
     ]);
 
-    basicType([PAGE.REGISTRIES, RESOURCE.REGISTRY], 'Advanced');
+    basicType([RESOURCE.REGISTRY], 'Advanced');
 
 }
\ No newline at end of file
diff --git a/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts b/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
index 3d6eaf0..ada2835 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
@@ -1,59 +1,61 @@
 import { elapsedTime } from "@shell/utils/time";
 
 export const REGISTRY_SCAN_TABLE = [
-  {
-    name: "scan",
-    labelKey: "imageScanner.registries.registrytable.header.scan",
-    value: "metadata.name",
-    formatter: "ScanNameCell",
-    sort: "scan",
-  },
   {
     name: "registry",
     labelKey: "imageScanner.registries.registrytable.header.registry",
-    value: "registry.id",
-    sort: "id",
+    value: "metadata.name",
+    sort: "registry",
+    formatter: "RegistryNameCell",
   },
   {
     name: "namespace",
     labelKey: "imageScanner.registries.registrytable.header.namespace",
     value: "metadata.namespace",
-    sort: "metadata.namespace",
+    sort: "namespace",
+  },
+  {
+    name: "uri",
+    labelKey: "imageScanner.registries.registrytable.header.uri",
+    value: "spec.uri",
+    sort: "uri",
   },
   {
     name: "repositories",
     labelKey: "imageScanner.registries.registrytable.header.repos",
-    value: "registry.spec.repositories",
-    sort: "registry.spec.repositories",
+    value: "spec.repositories",
+    sort: "repositories",
   },
   {
-    name: "schedule",
+    name: "scanInterval",
     labelKey: "imageScanner.registries.registrytable.header.schedule",
-    value: "schedule",
-    getValue: (row: any) => elapsedTime(row.schedule * 3600 * 1000).label,
-    sort: "schedule",
+    value: "spec.scanInterval",
+    getValue: (row: any) => elapsedTime(row.scanInterval * 3600 * 1000).label,
+    sort: "scanInterval",
   },
   {
     name: "status",
     labelKey: "imageScanner.registries.registrytable.header.status",
-    value: "registry.status.conditions.0.type",
+    value: "scanjobs.0.status.statusResult.type",
     formatter: "RegistryStatusCellBadge",
-    sort: "registry.status.conditions.0.type",
+    sort: "status",
+    width: 100,
   },
   {
     name: "_progress",
     labelKey: "imageScanner.registries.registrytable.header.progress",
-    value: "progress",
-    getValue: (row: any) => row.progress.toString(),
+    value: "scanjobs.0.status.imagesCount",
+    getValue: (row: any) => row.scanjobs[0].status.imagesCount,
     formatter: "ProgressCell",
     sort: "progress",
   },
   {
     name: "previousScan",
     labelKey: "imageScanner.registries.registrytable.header.prevScan",
-    value: "status.conditions.1.type",
+    getValue: (row: any) => row,
     formatter: "PreviousScanCell",
-    sort: "status.conditions.1.type",
+    sort: "previousScan",
+    width: 150,
   },
 ];
 
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/PreviousScanCell.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/PreviousScanCell.vue
index a7c8521..f3ecd70 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/formatters/PreviousScanCell.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/PreviousScanCell.vue
@@ -13,15 +13,15 @@ export default {
   },
   methods: {
     getStatusStyle(row) {
-      if (row && row.status && row.status.conditions && row.status.conditions.length > 1) {
+      if (row && row.scanjobs[1] && row.scanjobs[1].status && row.scanjobs[1].status.statusResult && row.scanjobs[1].status.statusResult.type) {
         return { color: 'var(--text-secondary)' };
       } else {
         return { color: 'var(--text-muted)' };
       }
     },
     getStatusText(row) {
-      if (row && row.status && row.status.conditions && row.status.conditions.length > 1) {
-        return this.t(`imageScanner.enum.status.${row.status.conditions[1].type.toLowerCase()}`);
+      if (row && row.scanjobs[1] && row.scanjobs[1].status && row.scanjobs[1].status.statusResult && row.scanjobs[1].status.statusResult.type) {
+        return this.t(`imageScanner.enum.status.${row.scanjobs[1].status.statusResult.type.toLowerCase()}`);
       } else {
         return this.t('imageScanner.enum.status.none');
       }
@@ -31,13 +31,17 @@ export default {
 </script>
 
 <template>
-    <div class="previous-scan-cell">
-        <div class="dot" :class="row.status.conditions[1].type.toLowerCase()"></div>
+    <div v-if="row && row.scanjobs[1] && row.scanjobs[1].status && row.scanjobs[1].status.statusResult && row.scanjobs[1].status.statusResult.type" class="previous-scan-cell">
+        <div class="dot" :class="row.scanjobs[1].status.statusResult.type.toLowerCase()"></div>
         <div class="status" :style="getStatusStyle(row)">{{ getStatusText(row) }}</div>  
-        <div v-if="row.status.conditions[1].progress">
-          <ProgressCell :status="row.status.conditions[1]" />
+        <div v-if="row.scanjobs[1].status.statusResult.progress">
+          <ProgressCell :status="row.scanjobs[1].status.statusResult" />
         </div>
     </div>
+    <div v-else class="previous-scan-cell">
+      <div class="dot pending"></div>
+      <div class="status" style="color: var(--text-secondary)">{{ t('imageScanner.enum.status.pending') }}</div>  
+    </div>
 </template>
 
 <style lang="scss" scoped>
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/ScanNameCell.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/RegistryNameCell.vue
similarity index 100%
rename from pkg/sbombastic-image-vulnerability-scanner/formatters/ScanNameCell.vue
rename to pkg/sbombastic-image-vulnerability-scanner/formatters/RegistryNameCell.vue
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/RegistryStatusCellBadge.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/RegistryStatusCellBadge.vue
index cb1c1c2..0d5e9f7 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/formatters/RegistryStatusCellBadge.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/RegistryStatusCellBadge.vue
@@ -14,5 +14,5 @@ export default {
 </script>
 
 <template>
-  <RegisterStatusBadge :status="value.toLowerCase()" />
+  <RegisterStatusBadge :status="value.toLowerCase() || 'pending'" />
 </template>
diff --git a/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml b/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
index b17a593..8aa067b 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
+++ b/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
@@ -6,6 +6,7 @@ imageScanner:
     button:
       addNew: Add new
       refresh: Refresh data
+      startScan: Start scan
     recentUpdatedRegistries:
       title: Latest status updates
     StatusDistribution:
@@ -15,9 +16,10 @@ imageScanner:
       header:
         scan: Scan
         registry: Registry
+        uri: URI
         namespace: Namespace
         repos: Repositories
-        schedule: Scheduled
+        schedule: Scan interval
         status: Status
         progress: Progress
         prevScan: Previous scan
@@ -59,6 +61,9 @@ imageScanner:
           imagesScanned: Images scan
           imagesFound: Images found
           errors: Error(s)
+    messages:
+      registryScanFailed: Registry scan failed
+      registryScanComplete: Registry scan complete
   images:
     title: Images
     downloadReport: Download full report
diff --git a/pkg/sbombastic-image-vulnerability-scanner/list/sbombastic.rancher.io.registry.vue b/pkg/sbombastic-image-vulnerability-scanner/list/sbombastic.rancher.io.registry.vue
index d2ee604..41af3eb 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/list/sbombastic.rancher.io.registry.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/list/sbombastic.rancher.io.registry.vue
@@ -1,265 +1,296 @@
 <template>
-  <div class="page">
-    <div class="header-section">
-      <div class="header-left">
-        <div class="state">&lt;State as of <span class="state-date-time">Jan 27, 2025  11:07 PM</span>&gt;</div>
-      </div>
-    </div>
+  <div>
+    <div class="state">State as of <span class="state-date-time">{{ latestUpdateTimeText }}</span></div>
     <div class="summary-section">
       <RecentUpdatedRegistries :registryStatusList="registryStatusList"/>
       <StatusDistribution :chartData="statusSummary"/>
     </div>
+    <button
+      mat-button
+      class="btn role-secondary"
+      style="margin-bottom: 12px;"
+      aria-label="Refresh data"
+      type="button"
+      @click="startScan()">
+      <em class="icon-refresh-ss"></em>{{ t('imageScanner.registries.button.startScan') }}
+    </button>
     <ResourceTable
-        :schema="schema"
-        :rows="rows"
-        :namespaced="false"
-        :groupable="false"
-        :hasAdvancedFiltering="true"
-        :headers="headers"
-        :use-query-params-for-simple-filtering="true"
+      ref="table"
+      :schema="schema"
+      :has-advanced-filtering="true"
+      :rows="rows"
+      :headers="headers"
+      @selection="onSelectionChange"
     />
   </div>
 </template>
 
 <script>
 
-import { ref } from "vue";
-import { RESOURCE } from "@sbombastic-image-vulnerability-scanner/types";
-import ResourceTable from "@shell/components/ResourceTable";
-import RecentUpdatedRegistries from "@sbombastic-image-vulnerability-scanner/components/RecentUpdatedRegistries";
-import StatusDistribution from "@sbombastic-image-vulnerability-scanner/components/StatusDistribution";
-import { REGISTRY_SCAN_TABLE } from "@sbombastic-image-vulnerability-scanner/config/table-headers";
-import {
-  PRODUCT_NAME,
-} from "@sbombastic-image-vulnerability-scanner/types";
-
-export default {
-  name: 'registries',
-  components: {
-    ResourceTable,
-    RecentUpdatedRegistries,
-    StatusDistribution
-  },
-  data() {
-    return {
-      content: ref("Registries"),
-      PRODUCT_NAME: PRODUCT_NAME,
-      rows: [],
-      registryStatusList: [],
-      statusSummary: {
-        scheduled: 0,
-        pending: 0,
-        inprogress: 0,
-        complete: 0,
-        failed: 0
-      },
-      headers: REGISTRY_SCAN_TABLE,
-    }
-  },
-
-  async fetch() {
-    await this.$store.dispatch('cluster/findAll', { type: RESOURCE.REGISTRY });
-    // let registriesCRD = this.$store.getters['cluster/all'](RESOURCE.REGISTRY);
-    // let registryMap = {};
-    // registriesCRD.forEach((rec) => {
-    //   if(rec.status) {
-    //     rec.status.conditions[0].type = rec.status.conditions[0].type.toLowerCase() === "discovering" ? "InProgress" : rec.status.conditions[0].type;
-    //     registryMap[rec.id] = rec;
-    //   }else{
-    //     registryMap[rec.id] = rec;
-    //   }
-    // });
-
-    if (this.$store.getters['cluster/canList'](RESOURCE.SCAN_JOB)) {
-      await this.$store.dispatch('cluster/findAll', { type: RESOURCE.SCAN_JOB });
-    }
-
-    let scanJobCRD = this.$store.getters['cluster/all'](RESOURCE.SCAN_JOB);
+  import { ref } from "vue";
+  import { RESOURCE } from "@sbombastic-image-vulnerability-scanner/types";
+  import ResourceTable from "@shell/components/ResourceTable";
+  import RecentUpdatedRegistries from "@sbombastic-image-vulnerability-scanner/components/RecentUpdatedRegistries";
+  import StatusDistribution from "@sbombastic-image-vulnerability-scanner/components/StatusDistribution";
+  import { REGISTRY_SCAN_TABLE } from "@sbombastic-image-vulnerability-scanner/config/table-headers";
+  import {
+    PRODUCT_NAME,
+  } from "@sbombastic-image-vulnerability-scanner/types";
+  import { escapeHtml } from '@shell/utils/string';
+  import day from 'dayjs';
+  import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
 
-    // this.rows = scanJobCRD.map((rec) => {
-    //   const key = `${rec.metadata.namespace}/${rec.spec.registry}`;
-    //   const reg = registryMap[key];
-    //
-    //   if (rec.spec && rec.spec.registry && reg) {
-    //     rec.registry = reg;
-    //     const status = rec.status.conditions?.[0]?.type?.toLowerCase();
-    //     const prevStatus = rec.status.conditions?.[1]?.type?.toLowerCase();
-    //     this.registryStatusList.push({
-    //       scan_name: rec.metadata.name,
-    //       registry_name: reg.id,
-    //       namespace: rec.metadata.namespace,
-    //       prev_status: prevStatus,
-    //       curr_status: status,
-    //       last_update_time: rec.status.conditions?.[0]?.lastUpdateTime
-    //     });
-    //
-    //     if (status && this.statusSummary.hasOwnProperty(status)) {
-    //       this.statusSummary[status]++;
-    //     }
-    //   }
-    //   return rec;
-    // });
+  export default {
+    name: 'registries',
+    components: {
+      ResourceTable,
+      RecentUpdatedRegistries,
+      StatusDistribution
+    },
+    data() {
+      return {
+        content: ref("Registries"),
+        PRODUCT_NAME: PRODUCT_NAME,
+        rows: [],
+        registryStatusList: [],
+        latestUpdateTime: null,
+        statusSummary: {
+          scheduled: 0,
+          pending: 0,
+          inprogress: 0,
+          complete: 0,
+          failed: 0
+        },
+        headers: REGISTRY_SCAN_TABLE,
+      }
+    },
 
-    // this.registryStatusList.sort((a, b) => new Date(b.last_update_time) - new Date(a.last_update_time)).slice(0, 5)
-    // while (this.registryStatusList.length < 5) {
-    //   this.registryStatusList.push({
-    //     scan_name: "",
-    //     registry_name: "",
-    //     prev_status: "",
-    //     curr_status: "",
-    //     last_update_time: new Date().toISOString()
-    //   });
-    // }
-  },
-  methods: {
-    refresh() {},
-    openAddEditRegistry() {},
-  },
-  computed: {
-    rows() {
+    async fetch() {
+      await this.$store.dispatch('cluster/findAll', { type: RESOURCE.REGISTRY });
+      if (this.$store.getters['cluster/canList'](RESOURCE.SCAN_JOB)) {
+        await this.$store.dispatch('cluster/findAll', { type: RESOURCE.SCAN_JOB });
+      }
+      this.loadData();
+    },
+    methods: {
+      loadData() {
+        this.registryStatusList = [];
+        this.statusSummary = {
+          scheduled: 0,
+          pending: 0,
+          inprogress: 0,
+          complete: 0,
+          failed: 0
+        };
+        this.latestUpdateTime = null;
+        
         let registriesCRD = this.$store.getters['cluster/all'](RESOURCE.REGISTRY);
-        //Make mock data for UI test
-        registriesCRD = registriesCRD.map((rec, index) => {
-          if (index === 0) {
-            rec.schedule = 3;
-            rec._status = "failed";
-            rec.errors = [
-              {
-                message: "Not enough resources to complete the scan. Could not connect to proxyu",
-              },
-            ];
-            rec.progress = 35;
-            rec.previous = {
-              _status: "scheduled",
-              errors: [],
-              progress: 0
-            };
+        let scanJobCRD = this.$store.getters['cluster/all'](RESOURCE.SCAN_JOB).sort((a, b) => {
+          if (!a.status || !a.status.startTime) {
+            return 1;
+          }
+          if (!b.status || !b.status.startTime) {
+            return -1;
+          }
+          return new Date(b.status.startTime) - new Date(a.status.startTime);
+        });
+
+        let scanJobMap = {};
+        scanJobCRD.forEach((rec) => {
+          rec.status.statusResult = rec.status.conditions.filter(condition => {
+            return condition.status === "True";
+          })[0] || {
+            type: "Pending",
+            lastUpdateTime: null,
+          };
+          if (scanJobMap[`${rec.metadata.namespace}/${rec.spec.registry}`]) {
+            scanJobMap[`${rec.metadata.namespace}/${rec.spec.registry}`].push(rec);
           } else {
-            rec.schedule = 29;
-            rec._status = "completed";
-            rec.errors = [];
-            rec.progress = 100;
-            rec.previous = {
-              _status: "Failed",
-              errors: [
-                {
-                  message: "Not enough resources to complete the scan. Could not connect to proxyu",
-                },
-              ],
-              progress: 49
-            };
+            scanJobMap[`${rec.metadata.namespace}/${rec.spec.registry}`] = [rec];
+          }
+        });
+
+        this.rows = registriesCRD.map((rec) => {
+          this.latestUpdateTime = new Date();
+          rec.id = `${rec.metadata.namespace}/${rec.metadata.name}`;
+          rec.scanjobs = scanJobMap[`${rec.metadata.namespace}/${rec.metadata.name}`] || [];
+          const status = rec.scanjobs?.[0]?.status?.statusResult?.type?.toLowerCase() || 'pending';
+          const prevStatus = rec.scanjobs?.[1]?.status?.statusResult?.type?.toLowerCase() || 'pending';
+          this.registryStatusList.push({
+            registry_name: rec.metadata.name,
+            uri: rec.spec.uri,
+            namespace: rec.metadata.namespace,
+            prev_status: prevStatus,
+            curr_status: status,
+            last_update_time: rec.scanjobs?.[0]?.status?.statusResult?.lastUpdateTime || rec.metadata.creationTimestamp,
+          });
+          if (status && this.statusSummary.hasOwnProperty(status)) {
+            this.statusSummary[status]++;
           }
           return rec;
         });
-        return registriesCRD;
+
+        this.registryStatusList.sort((a, b) => new Date(b.last_update_time) - new Date(a.last_update_time)).slice(0, 5)
+        while (this.registryStatusList.length < 5) {
+          this.registryStatusList.push({
+            registry_name: "",
+            uri: "",
+            prev_status: "",
+            curr_status: "",
+            last_update_time: new Date().toISOString()
+          });
+        }
+      },
+      refresh() {
+        window.location.reload();
+      },
+      async startScan() {
+        const table = this.$refs.table;
+        if ( !table ) {
+          return;
+        }
+        const scanjobObj = await this.$store.dispatch('cluster/create', {
+          type: RESOURCE.SCAN_JOB,
+          metadata: {
+            generateName: this.selectedRows[0].metadata.name,
+            namespace: this.selectedRows[0].metadata.namespace,
+          },
+          spec: {
+            registry: this.selectedRows[0].metadata.name,
+          }
+        });
+        try {
+          await scanjobObj.save();
+          this.loadData();
+          this.$store.dispatch('growl/success', {
+            title: this.t('imageScanner.registries.messages.registryScanComplete'),
+            message: this.t('imageScanner.registries.messages.registryScanComplete', { name: selection[0].metadata.name }),
+          });
+        } catch (e) {
+          this.$store.dispatch('growl/error', {
+            title: this.t('imageScanner.registries.messages.registryScanFailed'),
+            message: e.message,
+          });
+        }
+      },
+      openAddEditRegistry() {},
+      onSelectionChange(selected) {
+        this.selectedRows = selected || [];
       },
-    schema() {
-      return this.$store.getters['cluster/schemaFor'](RESOURCE.SCAN_JOB);
     },
+    computed: {
+      schema() {
+        return this.$store.getters['cluster/schemaFor'](RESOURCE.SCAN_JOB);
+      },
+      latestUpdateTimeText() {
+        const dateFormat = escapeHtml( this.$store.getters['prefs/get'](DATE_FORMAT));
+        const timeFormat = escapeHtml( this.$store.getters['prefs/get'](TIME_FORMAT));
+        return `${day(new Date(this.latestUpdateTime).getTime()).format(dateFormat)} ${day(new Date(this.latestUpdateTime).getTime()).format(timeFormat)}`;
+      },
+    }
   }
-}
 
 </script>
 
 
 <style lang="scss" scoped>
-.page {
-  display: flex;
-  flex-direction: column;
-  padding: 20px;
-  min-height: 100%;
-}
-.header-section {
-  display: flex;
-  align-items: flex-start;
-  gap: 24px;
-  align-self: stretch;
-  margin-bottom: 24px;
-  .header-left {
+  .page {
     display: flex;
     flex-direction: column;
-    justify-content: center;
-    align-items: flex-start;
-    gap: 4px;
-    flex: 1 0 0;
+    padding: 0 20px 20px 20px;
+    min-height: 100%;
   }
-  .title-wrap {
+  .header-section {
     display: flex;
-    align-items: center;
-    gap: 12px;
+    align-items: flex-start;
+    gap: 24px;
     align-self: stretch;
-    .title {
-      color: #141419;
-      font-family: Lato;
-      font-size: 24px;
-      font-style: normal;
-      font-weight: 600;
-      line-height: 32px; /* 133.333% */
+    margin-bottom: 24px;
+    .header-left {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: flex-start;
+      gap: 4px;
+      flex: 1 0 0;
     }
-    .state {
-      display: -webkit-box;
-      max-width: 900px;
-      -webkit-box-orient: vertical;
-      -webkit-line-clamp: 1;
+    .title-wrap {
+      display: flex;
+      align-items: center;
+      gap: 12px;
       align-self: stretch;
-      overflow: hidden;
-      color: #717179;
-
-      text-overflow: ellipsis;
-      font-family: Lato;
-      font-size: 14px;
-      font-style: normal;
-      font-weight: 400;
-      line-height: 21px; /* 150% */
-
-      .state-date-time {
-        overflow: hidden;
+      .title {
+        color: #141419;
+        font-family: Lato;
+        font-size: 24px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 32px; /* 133.333% */
+      }
+      .state {
+        display: -webkit-box;
+        max-width: 900px;
         -webkit-box-orient: vertical;
         -webkit-line-clamp: 1;
+        align-self: stretch;
+        overflow: hidden;
         color: #717179;
+
         text-overflow: ellipsis;
         font-family: Lato;
         font-size: 14px;
         font-style: normal;
-        font-weight: 600;
-        line-height: 21px;
+        font-weight: 400;
+        line-height: 21px; /* 150% */
+
+        .state-date-time {
+          overflow: hidden;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+          color: #717179;
+          text-overflow: ellipsis;
+          font-family: Lato;
+          font-size: 14px;
+          font-style: normal;
+          font-weight: 600;
+          line-height: 21px;
+        }
       }
     }
+    .header-right {
+      display: flex;
+      align-items: flex-end;
+      justify-content: end;
+      flex: 1 0 0;
+      gap: 24px;
+    }
+    .header-btn {
+      height: 40px;
+    }
+    .icon-add {
+      width: 16px;
+      height: 16px;
+      margin-right: 12px;
+      background: url('../assets/img/add.svg') no-repeat center center;
+      background-size: contain;
+    }
+    .icon-refresh-ss {
+      width: 16px;
+      height: 16px;
+      margin-right: 12px;
+      background: url('../assets/img/refresh.svg') no-repeat center center;
+      background-size: contain;
+    }
   }
-  .header-right {
+  .summary-section {
     display: flex;
-    align-items: flex-end;
-    justify-content: end;
-    flex: 1 0 0;
-    gap: 24px;
-  }
-  .header-btn {
-    height: 40px;
-  }
-  .icon-add {
-    width: 16px;
-    height: 16px;
-    margin-right: 12px;
-    background: url('../assets/img/add.svg') no-repeat center center;
-    background-size: contain;
-  }
-  .icon-refresh-ss {
-    width: 16px;
-    height: 16px;
-    margin-right: 12px;
-    background: url('../assets/img/refresh.svg') no-repeat center center;
-    background-size: contain;
+    min-width: 912px;
+    align-items: flex-start;
+    align-self: stretch;
+    border-radius: 6px;
+    border: 1px solid #DCDEE7;
+    background: #FFF;
+    margin: 24px 0;
   }
-}
-.summary-section {
-  display: flex;
-  min-width: 912px;
-  align-items: flex-start;
-  align-self: stretch;
-  border-radius: 6px;
-  border: 1px solid #DCDEE7;
-  background: #FFF;
-  margin: 24px 0;
-}
-
+   
 </style>
\ No newline at end of file
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Registries.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Registries.vue
deleted file mode 100644
index e3c6fae..0000000
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Registries.vue
+++ /dev/null
@@ -1,250 +0,0 @@
-<template>
-  <div class="page">
-    <div class="header-section">
-      <div class="header-left">
-        <div class="title-wrap">
-          <div class="title">{{ t('imageScanner.registries.title') }}</div>
-        </div>
-        <div class="state">&lt;State as of <span class="state-date-time">Jan 27, 2025  11:07 PM</span>&gt;</div>
-      </div>
-      <div class="header-right">
-        <div class="header-btn">
-          <button
-            mat-button
-            class="btn role-secondary"
-            aria-label="Refresh data"
-            type="button"
-            @click="refresh()">
-            <em class="icon-refresh-ss"></em>{{ t('imageScanner.registries.button.refresh') }}
-          </button>
-        </div>
-        <div class="header-btn">
-          <button
-            mat-button
-            class="btn role-primary"
-            aria-label="Add new"
-            type="button"
-            @click="openAddEditRegistry()">
-            <em class="icon-add"></em>{{ t('imageScanner.registries.button.addNew') }}
-          </button>
-        </div>
-      </div>
-    </div>
-    <div class="summary-section">
-      <RecentUpdatedRegistries :registryStatusList="registryStatusList"/>
-      <StatusDistribution :chartData="statusSummary"/>
-    </div>
-    <ResourceTable
-      :schema="schema"
-      :rows="rows"
-      :namespaced="false"
-      :groupable="false"
-      :hasAdvancedFiltering="true"
-      :headers="headers"
-      :use-query-params-for-simple-filtering="true"
-    />
-  </div>
-</template>
-
-<script>
-
-  import { ref } from "vue";
-  import { RESOURCE } from "@sbombastic-image-vulnerability-scanner/types";
-  import ResourceTable from "@shell/components/ResourceTable";
-  import RecentUpdatedRegistries from "@sbombastic-image-vulnerability-scanner/components/RecentUpdatedRegistries";
-  import StatusDistribution from "@sbombastic-image-vulnerability-scanner/components/StatusDistribution";
-  import { REGISTRY_SCAN_TABLE } from "@sbombastic-image-vulnerability-scanner/config/table-headers";
-  import {
-    PRODUCT_NAME,
-  } from "@sbombastic-image-vulnerability-scanner/types";
-
-  export default {
-    name: 'registries',
-    components: {
-      ResourceTable,
-      RecentUpdatedRegistries,
-      StatusDistribution
-    },
-    data() {
-      return {
-        content: ref("Registries"),
-        PRODUCT_NAME: PRODUCT_NAME,
-        rows: [],
-        registryStatusList: [],
-        statusSummary: {
-          scheduled: 0,
-          pending: 0,
-          inprogress: 0,
-          complete: 0,
-          failed: 0
-        },
-        headers: REGISTRY_SCAN_TABLE,
-      }
-    },
-
-    async fetch() {
-      await this.$store.dispatch('cluster/findAll', { type: RESOURCE.REGISTRY });
-      let registriesCRD = this.$store.getters['cluster/all'](RESOURCE.REGISTRY);
-
-      let registryMap = {};
-      registriesCRD.forEach((rec) => {
-        rec.status.conditions[0].type = rec.status.conditions[0].type.toLowerCase() === "discovering" ? "InProgress" : rec.status.conditions[0].type;
-        registryMap[rec.id] = rec;
-      });
-
-      if (this.$store.getters['cluster/canList'](RESOURCE.SCAN_JOB)) {
-        await this.$store.dispatch('cluster/findAll', { type: RESOURCE.SCAN_JOB });
-      }
-
-      let scanJobCRD = this.$store.getters['cluster/all'](RESOURCE.SCAN_JOB);
-
-      this.rows = scanJobCRD.map((rec) => {
-        const key = `${rec.metadata.namespace}/${rec.spec.registry}`;
-        const reg = registryMap[key];
-
-        if (rec.spec && rec.spec.registry && reg) {
-          rec.registry = reg;
-          const status = rec.status.conditions?.[0]?.type?.toLowerCase();
-          const prevStatus = rec.status.conditions?.[1]?.type?.toLowerCase();
-          this.registryStatusList.push({
-            scan_name: rec.metadata.name,
-            registry_name: reg.id,
-            namespace: rec.metadata.namespace,
-            prev_status: prevStatus,
-            curr_status: status,
-            last_update_time: rec.status.conditions?.[0]?.lastUpdateTime
-          });
-
-          if (status && this.statusSummary.hasOwnProperty(status)) {
-            this.statusSummary[status]++;
-          }
-        }
-        return rec;
-      });
-
-      this.registryStatusList.sort((a, b) => new Date(b.last_update_time) - new Date(a.last_update_time)).slice(0, 5)
-      while (this.registryStatusList.length < 5) {
-        this.registryStatusList.push({
-          scan_name: "",
-          registry_name: "",
-          prev_status: "",
-          curr_status: "",
-          last_update_time: new Date().toISOString()
-        });
-      }
-    },
-    methods: {
-      refresh() {},
-      openAddEditRegistry() {},
-    },
-    computed: {
-      schema() {
-        return this.$store.getters['cluster/schemaFor'](RESOURCE.SCAN_JOB);
-      },
-    }
-  }
-
-</script>
-
-
-<style lang="scss" scoped>
-  .page {
-    display: flex;
-    flex-direction: column;
-    padding: 20px;
-    min-height: 100%;
-  }
-  .header-section {
-    display: flex;
-    align-items: flex-start;
-    gap: 24px;
-    align-self: stretch;
-    margin-bottom: 24px;
-    .header-left {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: flex-start;
-      gap: 4px;
-      flex: 1 0 0;
-    }
-    .title-wrap {
-      display: flex;
-      align-items: center;
-      gap: 12px;
-      align-self: stretch;
-      .title {
-        color: #141419;
-        font-family: Lato;
-        font-size: 24px;
-        font-style: normal;
-        font-weight: 600;
-        line-height: 32px; /* 133.333% */
-      }
-      .state {
-        display: -webkit-box;
-        max-width: 900px;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 1;
-        align-self: stretch;
-        overflow: hidden;
-        color: #717179;
-
-        text-overflow: ellipsis;
-        font-family: Lato;
-        font-size: 14px;
-        font-style: normal;
-        font-weight: 400;
-        line-height: 21px; /* 150% */
-
-        .state-date-time {
-          overflow: hidden;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 1;
-          color: #717179;
-          text-overflow: ellipsis;
-          font-family: Lato;
-          font-size: 14px;
-          font-style: normal;
-          font-weight: 600;
-          line-height: 21px;
-        }
-      }
-    }
-    .header-right {
-      display: flex;
-      align-items: flex-end;
-      justify-content: end;
-      flex: 1 0 0;
-      gap: 24px;
-    }
-    .header-btn {
-      height: 40px;
-    }
-    .icon-add {
-      width: 16px;
-      height: 16px;
-      margin-right: 12px;
-      background: url('../../../../assets/img/add.svg') no-repeat center center;
-      background-size: contain;
-    }
-    .icon-refresh-ss {
-      width: 16px;
-      height: 16px;
-      margin-right: 12px;
-      background: url('../../../../assets/img/refresh.svg') no-repeat center center;
-      background-size: contain;
-    }
-  }
-  .summary-section {
-    display: flex;
-    min-width: 912px;
-    align-items: flex-start;
-    align-self: stretch;
-    border-radius: 6px;
-    border: 1px solid #DCDEE7;
-    background: #FFF;
-    margin: 24px 0;
-  }
-   
-</style>
\ No newline at end of file
diff --git a/pkg/sbombastic-image-vulnerability-scanner/routes/sbombastic-image-vulnerability-scanner-routes.ts b/pkg/sbombastic-image-vulnerability-scanner/routes/sbombastic-image-vulnerability-scanner-routes.ts
index 95de59a..500af8c 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/routes/sbombastic-image-vulnerability-scanner-routes.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/routes/sbombastic-image-vulnerability-scanner-routes.ts
@@ -10,11 +10,6 @@ import {
 } from "@sbombastic-image-vulnerability-scanner/types";
 
 const routes = [
-  {
-    name: `c-cluster-${PRODUCT_NAME}-${PAGE.REGISTRIES}`,
-    path: `/c/:cluster/${PRODUCT_NAME}/${PAGE.REGISTRIES}`,
-    component: Registries,
-  },
   {
     name: `c-cluster-${PRODUCT_NAME}-${PAGE.IMAGE_OVERVIEW}`,
     path: `/c/:cluster/${PRODUCT_NAME}/${PAGE.IMAGE_OVERVIEW}`,
diff --git a/tsconfig.json b/tsconfig.json
index 5ce1759..a82bee0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -49,9 +49,6 @@
     ]
   },
   "include": [
-    "./pkg/benchmark-compliance/**/*.ts",
-    "./pkg/benchmark-compliance/**/*.tsx",
-    "./pkg/benchmark-compliance/**/*.vue",
 
     "./pkg/sbombastic-image-vulnerability-scanner/**/*.ts",
     "./pkg/sbombastic-image-vulnerability-scanner/**/*.tsx",