diff --git a/lib/global-admin/addon/components/driver/driver-azureaks/component.js b/lib/global-admin/addon/components/driver/driver-azureaks/component.js
index 61dcf5f53..756fb7905 100644
--- a/lib/global-admin/addon/components/driver/driver-azureaks/component.js
+++ b/lib/global-admin/addon/components/driver/driver-azureaks/component.js
@@ -40,7 +40,7 @@ export default Component.extend(ACC, {
   memberConfig:    M_CONFIG,
 
   primaryResource: alias('cluster'),
-  config: alias('cluster.azureKubernetesEngineConfig'),
+  config: alias('cluster.azureKubernetesServiceConfig'),
 
   cluster: null,
   errors: null,
@@ -54,10 +54,11 @@ export default Component.extend(ACC, {
 
     window.gke = this;
 
-    let config = get(this, 'cluster.azureKubernetesEngineConfig');
+    let config = get(this, 'cluster.azureKubernetesServiceConfig');
     if ( !config ) {
       config = this.get('globalStore').createRecord({
-        type: 'azureKubernetesEngineConfig',
+        agentPoolName: "rancher",
+        type: 'azureKubernetesServiceConfig',
         osDiskSizeGb: 100,
         adminUsername: 'azureuser',
         kubernetesVersion: '1.8.1',
@@ -66,7 +67,7 @@ export default Component.extend(ACC, {
         location: 'eastus',
       });
 
-      set(this, 'cluster.azureKubernetesEngineConfig', config);
+      set(this, 'cluster.azureKubernetesServiceConfig', config);
     }
   },
 
diff --git a/lib/global-admin/addon/components/driver/driver-azureaks/template.hbs b/lib/global-admin/addon/components/driver/driver-azureaks/template.hbs
index 75885a21d..2d0db8fcc 100644
--- a/lib/global-admin/addon/components/driver/driver-azureaks/template.hbs
+++ b/lib/global-admin/addon/components/driver/driver-azureaks/template.hbs
@@ -27,10 +27,14 @@
   <h4>{{t 'machine.driverAzure.accountAccessSection'}}</h4>
 
   <div class="row">
-    <div class="col span-4">
+    <div class="col span-6 mb-0">
       <label class="acc-label">{{t 'machine.driverAzure.subscriptionId.label'}}{{field-required}}</label>
       {{input type="text" value=config.subscriptionId classNames="form-control" placeholder=(t 'machine.driverAzure.subscriptionId.placeholder')}}
     </div>
+    <div class="col span-6 mb-0">
+      <label class="acc-label">{{t 'machine.driverAzure.tenant.label'}}{{field-required}}</label>
+      {{input type="text" value=config.tenantId classNames="form-control" placeholder=(t 'machine.driverAzure.tenant.placeholder')}}
+    </div>
   </div>
 
   <div class="row">
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 38c5e79cb..157276de9 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -3377,6 +3377,9 @@ machine:
     subscriptionId:
       label: Subscription ID
       placeholder: Your Azure subscription ID
+    tenant:
+      label: Tenant ID
+      placeholder: Your Azure tenant ID
     instanceSection: Instance
     instanceOptionsSection: Instance Options
     image: