diff --git a/pkg/sbombastic-image-vulnerability-scanner/constants/scan-interval-options.ts b/pkg/sbombastic-image-vulnerability-scanner/constants/scan-interval-options.ts
index 9864d50..006d48a 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/constants/scan-interval-options.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/constants/scan-interval-options.ts
@@ -21,7 +21,7 @@ export const REGISTRY_TYPE = {
 }
 
 export const REGISTRY_DEFAULT_URI = {
-  DOCKERHUB: "https://registry.hub.docker.com"
+  DOCKERHUB: "index.docker.io"
 };
 
 export const REGISTRY_TYPE_OPTIONS: {label: string; value: string }[] = [
diff --git a/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue b/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue
index 9477587..4752564 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue
@@ -2,7 +2,6 @@
 import CreateEditView from '@shell/mixins/create-edit-view';
 import Footer from '@shell/components/form/Footer';
 import { LabeledInput } from '@components/Form/LabeledInput';
-import { RadioGroup } from '@components/Form/Radio';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import CruResource from '@shell/components/CruResource';
 import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthSecret';
@@ -21,7 +20,6 @@ export default {
 
   components: {
     Footer,
-    RadioGroup,
     LabeledInput,
     NameNsDescription,
     CruResource,
@@ -54,11 +52,6 @@ export default {
   },
 
   computed: {
-    namespace(){
-      console.log('this.value.spec.type:',this.value.spec.type);
-      return this.value.spec.type === 'ecr'?"kube-system":""
-    },
-
     inStore() {
       return this.$store.getters['currentProduct']?.inStore || MANAGEMENT;
     },
@@ -163,16 +156,25 @@ export default {
       <div class="row">
         <div class="col span-6" >
           <LabeledSelect
+              data-testid="registry-scanning-repository-names"
               v-model:value="value.spec.repositories"
-              :options="value.spec.repositories"
+              :taggable="true"
+              :searchable="true"
+              :push-tags="true"
+              :close-on-select="false"
+              :mode="mode"
+              :multiple="true"
+              :label="t('imageScanner.registries.configuration.cru.scan.repoName')"
               :placeholder="t('imageScanner.registries.configuration.cru.scan.placeholder')"
-              :label="t('imageScanner.registries.configuration.cru.scan.type')"
+              :options="value.spec.repositories"
+              :disabled="mode==='view'"
+              @update:value="update"
           />
         </div>
         <div class="col span-3">
           <LabeledSelect
               v-model:value="value.spec.scanInterval"
-              data-testid="registry-scan-interval-select"
+              data-testid="registry-scanning-interval-select"
               :options = "SCAN_INTERVAL_OPTIONS"
               option-key="value"
               option-label="label"
diff --git a/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml b/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
index e5dd95c..4545c61 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
+++ b/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
@@ -44,8 +44,8 @@ imageScanner:
           label: Authentication
         scan:
           label: Scanning
-          type: Repositories to scan
-          placeholder: Type and press Enter ...
+          repoName: Repositories to scan
+          placeholder: Leave empty to scan all. Type and press Enter to add repositories.
           schedule:
             label: Scan Interval
       scan: Start Scan