diff --git a/lib/global-admin/addon/clusters/new/rke/controller.js b/lib/global-admin/addon/clusters/new/rke/controller.js
index a3179104e..e0cf5f263 100644
--- a/lib/global-admin/addon/clusters/new/rke/controller.js
+++ b/lib/global-admin/addon/clusters/new/rke/controller.js
@@ -8,12 +8,10 @@ import NewOrEdit from 'ui/mixins/new-or-edit';
 import EmberObject from '@ember/object';
 import { reject, all as PromiseAll } from 'rsvp';
 
-const RKECONFIGHOST_DEFAULT = {
-  advertisedHostname: '',
+const RKECONFIGNODE_DEFAULT = {
   role: null,
   type: 'rkeConfigHost',
-  user: '',
-  ssh: '',
+  machineId: null,
 };
 
 const headersAll = [
@@ -122,15 +120,15 @@ export default Controller.extend(NewOrEdit, {
     return get(this, 'countMap.worker') >= 1;
   }),
 
-  countState: observer('config.hosts.[]', function() {
-    let hosts = (get(this, 'config.hosts') || []);
+  countState: observer('config.nodes.[]', function() {
+    let nodes = (get(this, 'config.nodes') || []);
     let countMap = {
       etcd: 0,
       controlplane: 0,
       worker: 0,
     };
 
-    hosts.forEach((host) => {
+    nodes.forEach((host) => {
       get(host, 'role').forEach((role) => {
         countMap[role]++;
       });
@@ -140,14 +138,14 @@ export default Controller.extend(NewOrEdit, {
 
   scopeChanged: observer('scope', function() {
     let config = get(this, 'config');
-    set(config, 'hosts', []);
+    set(config, 'nodes', []);
   }),
 
   actions: {
     addHost() {
       get(this, 'modal').toggleModal('modal-add-cluster', {
         templates: get(this, 'model.machineTemplates'),
-        hosts: get(this, 'model.hosts'),
+        nodes: get(this, 'model.nodes'),
         drivers: get(this, 'model.machineDrivers'),
       });
     },
@@ -156,10 +154,10 @@ export default Controller.extend(NewOrEdit, {
     },
     addRole(host, type) {
       let clusterStore = get(this, 'clusterStore');
-      let neu = EmberObject.create(RKECONFIGHOST_DEFAULT);
+      let neu = EmberObject.create(RKECONFIGNODE_DEFAULT);
       let config = get(this, 'config');
-      let hosts = ( get(config, 'hosts') || [] ).slice();
-      let match = hosts.findBy('advertisedHostname', get(host, 'displayName'))
+      let nodes = ( get(config, 'nodes') || [] ).slice();
+      let match = nodes.findBy('machineId', get(host, 'id'));
       if (match) {
         let roles = get(match, 'role');
         // exists now check roles
@@ -168,7 +166,7 @@ export default Controller.extend(NewOrEdit, {
           roles.removeObject(type);
           //last one? remove that as well
           if (roles.length === 0) {
-            hosts.removeObject(match);
+            nodes.removeObject(match);
           }
         } else {
           //add new role
@@ -176,16 +174,16 @@ export default Controller.extend(NewOrEdit, {
         }
       } else {
         neu.setProperties({
-          advertisedHostname: get(host, 'displayName'),
           role: [type],
           type: 'rkeConfigHost',
-          user: 'root',
-          ssh: '123',
+          machineId: get(host, 'id')
+          // user: 'root',
+          // ssh: '123',
         });
         neu = clusterStore.createRecord(neu);
-        hosts.addObject(neu);
+        nodes.addObject(neu);
       }
-      set(config, 'hosts', hosts); //so the countState observer updates
+      set(config, 'nodes', nodes); //so the countState observer updates
     }
   },
 
diff --git a/lib/global-admin/addon/clusters/new/rke/route.js b/lib/global-admin/addon/clusters/new/rke/route.js
index b7c8d28a0..7e0eba2d8 100644
--- a/lib/global-admin/addon/clusters/new/rke/route.js
+++ b/lib/global-admin/addon/clusters/new/rke/route.js
@@ -15,14 +15,14 @@ export default Ember.Route.extend({
         options: [],
         plugin:'flannel',
       },
-      auth: {
+      authentication: {
         options: [],
         strategy: 'x509',
       }
     };
     let config = clusterStore.createRecord(def);
     let models = this.modelFor('clusters.new');
-    let { cluster, machineTemplates, machineDrivers, hosts, roleTemplates: roles, policies } = models;
+    let { cluster, machineTemplates, machineDrivers, hosts: nodes, roleTemplates: roles, policies } = models;
 
     set(cluster, 'rancherKubernetesEngineConfig', config);
 
@@ -30,7 +30,7 @@ export default Ember.Route.extend({
       cluster,
       machineTemplates,
       machineDrivers,
-      hosts,
+      nodes,
       roles,
       policies,
     };
diff --git a/lib/global-admin/addon/clusters/new/rke/template.hbs b/lib/global-admin/addon/clusters/new/rke/template.hbs
index b66b8ca86..dcb848008 100644
--- a/lib/global-admin/addon/clusters/new/rke/template.hbs
+++ b/lib/global-admin/addon/clusters/new/rke/template.hbs
@@ -47,7 +47,7 @@
       }}
         {{#sortable-table
              classNames="grid sortable-table"
-             body=model.hosts
+             body=model.nodes
              searchText=searchText
              sortBy=sortBy
              fullRows=true
@@ -152,7 +152,7 @@
                   classNames="form-control"
                   content=authChoices
                   localizedLabel=true
-                  value=config.auth.strategy
+                  value=config.authentication.strategy
               }}
             </div>
             <div class="col span-6">
diff --git a/lib/shared/addon/components/cloud-host-add-or-edit/component.js b/lib/shared/addon/components/cloud-host-add-or-edit/component.js
index 97cbd1e61..112e4c50a 100644
--- a/lib/shared/addon/components/cloud-host-add-or-edit/component.js
+++ b/lib/shared/addon/components/cloud-host-add-or-edit/component.js
@@ -3,7 +3,7 @@ import Component from '@ember/component';
 import Driver from 'shared/mixins/host-driver';
 import layout from './template';
 import { inject as service } from '@ember/service';
-import { get } from '@ember/object';
+import { get, set } from '@ember/object';
 
 export default Component.extend(Driver, {
   layout,
@@ -19,8 +19,11 @@ export default Component.extend(Driver, {
     this._super(...arguments);
 
     let cm = get(this, 'clusterStore').createRecord({type: 'machine'});
+
+    set(cm, 'machineTemplateId', get(this, 'machineTemplate.id'));
+
     this.setProperties({
-      hostOptions: this.get(`machineTemplate.${this.get('machineTemplate.driver')}Config`),
+      hostOptions: get(this, `machineTemplate.${this.get('machineTemplate.driver')}Config`),
       // @@TODO@@ - 11-28-17 - not sure we should be doing this this way how the heck do we know which host to clone labels from?
       // clonedModel: this.get('host').clone(),
       clonedModel: cm,
diff --git a/lib/shared/addon/components/cloud-host-add-or-edit/template.hbs b/lib/shared/addon/components/cloud-host-add-or-edit/template.hbs
index 23b42f517..79a7658db 100644
--- a/lib/shared/addon/components/cloud-host-add-or-edit/template.hbs
+++ b/lib/shared/addon/components/cloud-host-add-or-edit/template.hbs
@@ -28,7 +28,7 @@
           </div>
           <hr/>
           {{#if driver.hasUi}}
-            {{component (concat 'host/host-templates/' machineTemplate.driver) machineTemplate=model.template}}
+            {{component (concat 'host-template-' machineTemplate.driver) machineTemplate=model.template}}
           {{else}}
             {{component 'host-template-other' machineTemplate=model.template}}
           {{/if}}