diff --git a/app/models/cluster.js b/app/models/cluster.js
index 892970e25..815584e54 100644
--- a/app/models/cluster.js
+++ b/app/models/cluster.js
@@ -321,7 +321,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
 
       return firstPool.driver || get(firstPool, 'nodeTemplate.driver') || null;
     default:
-      if (get(this, 'driver') && get(this, 'configName')) {
+      if (get(this, 'driver') && get(this, 'configName') && !isEmpty(get(this, this.configName))) {
         return get(this, 'driver');
       } else {
         return 'import';
diff --git a/lib/shared/addon/components/cluster-driver/driver-import/component.js b/lib/shared/addon/components/cluster-driver/driver-import/component.js
index 250a6dc8f..06477f56b 100644
--- a/lib/shared/addon/components/cluster-driver/driver-import/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-import/component.js
@@ -14,9 +14,10 @@ export default Component.extend(ClusterDriver, {
   intl:        service(),
 
   layout,
-  configField:   'importedConfig',
-  step:          1,
-  nodeForInfo:   null,
+  configField:     'importedConfig',
+  step:            1,
+  nodeForInfo:     null,
+  isDockerCluster: false,
 
   isEdit:        equal('mode', 'edit'),
   isView:        equal('mode', 'view'),
@@ -36,10 +37,7 @@ export default Component.extend(ClusterDriver, {
         }
 
         if (isEmpty(this.model.cluster.k3sConfig)) {
-          set(this, 'model.cluster.k3sConfig', this.globalStore.createRecord({
-            type:              'k3sConfig',
-            kubernetesVersion: this.cluster.version.gitVersion
-          }));
+          set(this, 'isDockerCluster', true);
         }
       } else if (this.isRke2Cluster) {
         set(this, 'configField', 'rke2Config');
@@ -114,7 +112,7 @@ export default Component.extend(ClusterDriver, {
     } = this;
     let errors = [];
 
-    if (field === 'k3sConfig' || field === 'rke2Config' ) {
+    if (field === 'k3sConfig' && !isEmpty(config)) {
       if (config.k3supgradeStrategy) {
         // doesn't work because missing deep validation
         // errors = config.k3supgradeStrategy.validationErrors();
@@ -122,9 +120,6 @@ export default Component.extend(ClusterDriver, {
           errors.push(this.intl.t('clusterNew.k3simport.errors.concurrency.negative'))
         }
       }
-      if (config.rke2upgradeStrategy) {
-
-      }
     }
 
     if (!isEmpty(errors)) {
diff --git a/lib/shared/addon/components/cluster-driver/driver-import/template.hbs b/lib/shared/addon/components/cluster-driver/driver-import/template.hbs
index 1c38ac3e6..9756bd237 100644
--- a/lib/shared/addon/components/cluster-driver/driver-import/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-import/template.hbs
@@ -1,4 +1,4 @@
-{{#if (and (eq step 1) (or isK3sCluster isRke2Cluster))}}
+{{#if (and (eq step 1) (and (or isK3sCluster isRke2Cluster) (not isDockerCluster)))}}
   <AccordionList @showExpandAll={{false}} as |al expandFn|>
     <AccordionListItem
       @title={{t "managedImportClusterInfo.title" provider=cluster.displayProvider}}
diff --git a/lib/shared/addon/components/cru-cluster/component.js b/lib/shared/addon/components/cru-cluster/component.js
index 2c58680b9..af36d4693 100644
--- a/lib/shared/addon/components/cru-cluster/component.js
+++ b/lib/shared/addon/components/cru-cluster/component.js
@@ -438,10 +438,22 @@ export default Component.extend(ViewNewEdit, ChildHook, {
 
   doneSaving(saved) {
     if ( get(this, 'step') === 1 && get(this, 'driverInfo.preSave') && !get(this, 'driverInfo.postSave') ) {
-      setProperties(this, {
-        step:            2,
-        initialProvider: get(this, 'provider')
-      });
+      const skipK3sImport = !isEmpty(saved?.provider) && saved.provider === 'k3s' && isEmpty(saved?.k3sConfig);
+
+      if (skipK3sImport && this.originalCluster?.state !== 'pending') {
+        if (this.close) {
+          this.close(saved);
+        }
+      } else if (this.originalCluster?.state === 'pending') {
+        setProperties(this, {
+          step:            2,
+          initialProvider: get(this, 'provider')
+        });
+      } else {
+        if (this.close) {
+          this.close(saved);
+        }
+      }
     } else if (get(this, 'driverInfo.postSave')) {
       setProperties(this, {
         initialProvider: get(this, 'provider'),