diff --git a/pkg/harvester-manager/machine-config/harvester.vue b/pkg/harvester-manager/machine-config/harvester.vue
index 54c0af536c..a4e0204261 100644
--- a/pkg/harvester-manager/machine-config/harvester.vue
+++ b/pkg/harvester-manager/machine-config/harvester.vue
@@ -729,7 +729,7 @@ export default {
         <transition-group>
           <div
             v-for="(disk, i) in disks"
-            :key="i"
+            :key="`${disk.bootOrder}${i}`"
           >
             <InfoBox
               class="box"
diff --git a/shell/config/harvester-manager-types.js b/shell/config/harvester-manager-types.js
new file mode 100644
index 0000000000..9c70307c3e
--- /dev/null
+++ b/shell/config/harvester-manager-types.js
@@ -0,0 +1 @@
+export const NAME = 'harvesterManager';
diff --git a/shell/edit/provisioning.cattle.io.cluster/import.vue b/shell/edit/provisioning.cattle.io.cluster/import.vue
index 313feed955..ec647e9f4b 100644
--- a/shell/edit/provisioning.cattle.io.cluster/import.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/import.vue
@@ -10,7 +10,7 @@ import { CAPI, HCI } from '@shell/config/types';
 import ClusterMembershipEditor from '@shell/components/form/Members/ClusterMembershipEditor';
 import { Banner } from '@components/Banner';
 import { canViewClusterMembershipEditor } from '@shell/components/form/Members/ClusterMembershipEditor.vue';
-import { NAME as HARVESTER_MANAGER } from '@/pkg/harvester-manager/config/harvester-manager';
+import { NAME as HARVESTER_MANAGER } from '@shell/config/harvester-manager-types';
 import { HARVESTER as HARVESTER_FEATURE, mapFeature } from '@shell/store/features';
 import { addObject } from '@shell/utils/array';
 import { HIDE_DESC, mapPref } from '@shell/store/prefs';
diff --git a/shell/package.json b/shell/package.json
index f175628ef2..9cff6a8590 100644
--- a/shell/package.json
+++ b/shell/package.json
@@ -138,6 +138,7 @@
     "vue-server-renderer": "2.6.14",
     "vue-shortkey": "3.1.7",
     "vue-template-compiler": "2.6.14",
+    "vue-virtual-scroll-list": "^2.3.4",
     "vue2-transitions": "0.3.0",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.2",