diff --git a/app/authenticated/cluster/edit/template.hbs b/app/authenticated/cluster/edit/template.hbs
index e115c6e0a..a5d9d2bc0 100644
--- a/app/authenticated/cluster/edit/template.hbs
+++ b/app/authenticated/cluster/edit/template.hbs
@@ -5,7 +5,7 @@
 </section>
 
 <CruCluster
-  @applyClusterTemplate={{not (is-empty model.clusterTemplateRevisionId)}}
+  @applyClusterTemplate={{not (is-empty clusterTemplateRevision)}}
   @clusterTemplateRevisionId={{mut clusterTemplateRevision}}
   @model={{model}}
   @initialProvider={{cluster.provider}}
diff --git a/app/models/clustertemplate.js b/app/models/clustertemplate.js
index 5ccddf252..50f1fae13 100644
--- a/app/models/clustertemplate.js
+++ b/app/models/clustertemplate.js
@@ -45,7 +45,7 @@ const ClusterTemplate =  Resource.extend({
 
   actions: {
     newRevision() {
-      this.router.transitionTo('global-admin.cluster-templates.new-revision', this.id);
+      this.router.transitionTo('global-admin.cluster-templates.new-revision', this.id, { queryParams: { revision: this.defaultRevisionId } });
     },
 
     edit() {
diff --git a/lib/global-admin/addon/clusters/new/launch/route.js b/lib/global-admin/addon/clusters/new/launch/route.js
index bf88ee1a8..56925f9e0 100644
--- a/lib/global-admin/addon/clusters/new/launch/route.js
+++ b/lib/global-admin/addon/clusters/new/launch/route.js
@@ -12,19 +12,23 @@ export default Route.extend({
   clusterTemplateService: service('clusterTemplates'),
 
   beforeModel(transition) {
-    const { clusterTemplates } = this.modelFor('clusters.new');
-    let { clusterTemplateEnforcement = false }    = this.settings;
+    let { me: { hasAdmin: globalAdmin = false } } = this.access;
 
-    // setting is string value
-    if (clusterTemplateEnforcement === 'true') {
-      clusterTemplateEnforcement = true;
-    } else {
-      clusterTemplateEnforcement = false;
-    }
+    if (!globalAdmin) {
+      const { clusterTemplates } = this.modelFor('clusters.new');
+      let { clusterTemplateEnforcement = false }    = this.settings;
 
-    if (clusterTemplateEnforcement) {
-      if (clusterTemplates.length === 1 && isEmpty(transition.queryParams.clusterTemplateRevision)) {
-        return this.replaceWith(this.routeName, transition.to.params.provider, { queryParams: { clusterTemplateRevision: clusterTemplates.firstObject.defaultRevisionId } });
+      // setting is string value
+      if (clusterTemplateEnforcement === 'true') {
+        clusterTemplateEnforcement = true;
+      } else {
+        clusterTemplateEnforcement = false;
+      }
+
+      if (clusterTemplateEnforcement) {
+        if (clusterTemplates.length === 1 && isEmpty(transition.queryParams.clusterTemplateRevision)) {
+          return this.replaceWith(this.routeName, transition.to.params.provider, { queryParams: { clusterTemplateRevision: clusterTemplates.firstObject.defaultRevisionId } });
+        }
       }
     }
 
diff --git a/lib/global-admin/addon/clusters/new/launch/template.hbs b/lib/global-admin/addon/clusters/new/launch/template.hbs
index be5882beb..51d209367 100644
--- a/lib/global-admin/addon/clusters/new/launch/template.hbs
+++ b/lib/global-admin/addon/clusters/new/launch/template.hbs
@@ -1,5 +1,5 @@
 <CruCluster
-  @applyClusterTemplate={{not (is-empty model.clusterTemplateRevision)}}
+  @applyClusterTemplate={{not (is-empty clusterTemplateRevision)}}
   @model={{model}}
   @provider={{model.provider}}
   @mode="new"
diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/component.js b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
index aebfca632..71691f104 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
@@ -130,16 +130,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
   init() {
     this._super();
 
-    this.initNodeCounts();
-
-    if (!this.useClusterTemplate && this.clusterTemplateRevisionId) {
-      setProperties(this, {
-        useClusterTemplate: true,
-        forceExpandOnInit:  true,
-      })
-    }
-
-    if (!this.applyClusterTemplate) {
+    var initNonTemplateCluster = () => {
       if ( get(this, 'isNew') ) {
         this.createRkeConfigWithDefaults();
       } else {
@@ -153,6 +144,23 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
       });
     }
 
+    this.initNodeCounts();
+
+    if (!this.useClusterTemplate && this.clusterTemplateRevisionId) {
+      setProperties(this, {
+        useClusterTemplate: true,
+        forceExpandOnInit:  true,
+      })
+    }
+
+    if (this.applyClusterTemplate) {
+      if (!this.useClusterTemplate) {
+        initNonTemplateCluster();
+      }
+    } else {
+      initNonTemplateCluster();
+    }
+
     if ( get(this, 'isEdit') && get(this, 'primaryResource.isWindows') ) {
       set(this, 'windowsSupport', true)
     }
@@ -341,7 +349,9 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
   enforcementChanged: on('init', observer('settings.clusterTemplateEnforcement', function() {
     let { me: { hasAdmin: globalAdmin = null } } = this.access;
     let { clusterTemplateEnforcement = false } = this.settings;
+    let useClusterTemplate = false;
 
+    // what happens for globalAdmin?
     if (!globalAdmin) {
       // setting is string value
       if (clusterTemplateEnforcement === 'true') {
@@ -350,7 +360,19 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
         clusterTemplateEnforcement = false;
       }
 
-      set(this, 'useClusterTemplate', this.clusterTemplateRevisionId ? true : false);
+      if (this.applyClusterTemplate) {
+        if (clusterTemplateEnforcement) {
+          useClusterTemplate = true;
+        } else if (this.clusterTemplateRevisionId) {
+          useClusterTemplate = true;
+        }
+      } else {
+        if (this.clusterTemplateRevisionId) {
+          useClusterTemplate = true;
+        }
+      }
+
+      set(this, 'useClusterTemplate', useClusterTemplate);
       set(this, 'clusterTemplatesEnforced', clusterTemplateEnforcement);
     }
   })),
diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
index a67a538a2..5a970ae90 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
@@ -47,7 +47,7 @@
   </section>
 {{/unless}}
 
-{{#if (or (not clusterTemplatesEnforced) (and clusterTemplatesEnforced clusterTemplateRevisionId))}}
+{{#if (or clusterTemplateCreate (or (not clusterTemplatesEnforced) (and clusterTemplatesEnforced clusterTemplateRevisionId)))}}
 
   {{#if (and (not applyClusterTemplate) (not clusterTemplateCreate))}}
     <section class="has-tabs p-0 pull-left">
diff --git a/lib/shared/addon/components/cru-cluster-template/template.hbs b/lib/shared/addon/components/cru-cluster-template/template.hbs
index 1fdcc01d9..2235b9c31 100644
--- a/lib/shared/addon/components/cru-cluster-template/template.hbs
+++ b/lib/shared/addon/components/cru-cluster-template/template.hbs
@@ -75,6 +75,7 @@
     nodeWhich="custom"
     clusterTemplateCreate=true
     clusterTemplateQuestions=clusterTemplateRevision.questions
+    clusterTemplateRevisionId=clusterTemplateRevisionId
     addQuestion=(action "addQuestion")
     removeQuestion=(action "removeQuestion")
     model=(hash