diff --git a/defaults/main.yml b/defaults/main.yml
index aef4f2d8..6d218a23 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -40,10 +40,15 @@ nova_virt_type: kvm
 
 ## Nova Auth
 nova_service_region: RegionOne
-nova_service_tenant_name: "service"
+nova_service_project_name: "service"
+nova_service_project_domain_id: default
+nova_service_user_domain_id: default
 nova_service_user_name: "nova"
 nova_service_role_name: "admin"
 
+## Keystone authentication middleware
+nova_keystone_auth_plugin: password
+
 ## Nova enabled apis
 nova_enabled_apis: "osapi_compute,metadata"
 
diff --git a/tasks/nova_service_setup.yml b/tasks/nova_service_setup.yml
index 5292b847..78d10817 100644
--- a/tasks/nova_service_setup.yml
+++ b/tasks/nova_service_setup.yml
@@ -16,7 +16,7 @@
 - include: nova_service_add.yml
   vars:
     service_user_name: "{{ nova_service_user_name }}"
-    service_tenant_name: "{{ nova_service_tenant_name }}"
+    service_tenant_name: "{{ nova_service_project_name }}"
     service_name: "{{ nova_service_name }}"
     service_type: "{{ nova_service_type }}"
     service_region: "{{ nova_service_region }}"
@@ -34,7 +34,7 @@
 - include: nova_service_add.yml
   vars:
     service_user_name: "{{ nova_service_user_name }}"
-    service_tenant_name: "{{ nova_service_tenant_name }}"
+    service_tenant_name: "{{ nova_service_project_name }}"
     service_name: "{{ nova_v21_service_name }}"
     service_type: "{{ nova_v21_service_type }}"
     service_region: "{{ nova_service_region }}"
@@ -51,7 +51,7 @@
 - include: nova_service_add.yml
   vars:
     service_user_name: "{{ nova_service_user_name }}"
-    service_tenant_name: "{{ nova_service_tenant_name }}"
+    service_tenant_name: "{{ nova_service_project_name }}"
     service_name: "{{ nova_v3_service_name }}"
     service_type: "{{ nova_v3_service_type }}"
     service_region: "{{ nova_service_region }}"
@@ -70,7 +70,7 @@
 - include: nova_service_add.yml
   vars:
     service_user_name: "{{ nova_service_user_name }}"
-    service_tenant_name: "{{ nova_service_tenant_name }}"
+    service_tenant_name: "{{ nova_service_project_name }}"
     service_name: "{{ nova_s3_service_name }}"
     service_type: "{{ nova_s3_service_type }}"
     service_region: "{{ nova_service_region }}"
@@ -89,7 +89,7 @@
 - include: nova_service_add.yml
   vars:
     service_user_name: "{{ nova_service_user_name }}"
-    service_tenant_name: "{{ nova_service_tenant_name }}"
+    service_tenant_name: "{{ nova_service_project_name }}"
     service_name: "{{ nova_ec2_service_name }}"
     service_type: "{{ nova_ec2_service_type }}"
     service_region: "{{ nova_service_region }}"
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 2c8c5c74..2a1ebc8d 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -146,12 +146,15 @@ enabled = False
 
 
 [keystone_authtoken]
+auth_plugin = {{ nova_keystone_auth_plugin }}
 signing_dir = {{ nova_system_home_folder }}/cache/api
-identity_uri = {{ keystone_service_adminuri }}
-auth_uri = {{ keystone_service_internalurl }}
-admin_tenant_name = {{ nova_service_tenant_name }}
-admin_user = {{ nova_service_user_name }}
-admin_password = {{ nova_service_password }}
+auth_url = {{ keystone_service_adminuri }}
+auth_uri = {{ keystone_service_internaluri }}
+project_domain_id = {{ nova_service_project_domain_id }}
+user_domain_id = {{ nova_service_user_domain_id }}
+project_name = {{ nova_service_project_name }}
+username = {{ nova_service_user_name }}
+password = {{ nova_service_password }}
 
 memcached_servers = {{ memcached_servers }}