diff --git a/tasks/nova_service_add.yml b/tasks/nova_service_add.yml
index 60bfa48d..13478fdc 100644
--- a/tasks/nova_service_add.yml
+++ b/tasks/nova_service_add.yml
@@ -79,10 +79,14 @@
     region_name: "{{ service_region }}"
     service_name: "{{ service_name }}"
     service_type: "{{ service_type }}"
-    publicurl: "{{ service_publicurl }}"
-    adminurl: "{{ service_internalurl }}"
-    internalurl: "{{ service_adminurl }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
+    endpoint_list:
+      - url: "{{ service_publicurl }}"
+        interface: "public"
+      - url: "{{ service_internalurl }}"
+        interface: "internal"
+      - url: "{{ service_adminurl }}"
+        interface: "admin"
   register: add_service
   until: add_service|success
   retries: 5
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 332c0542..f31d0e7d 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -139,11 +139,17 @@ port = {{ glance_service_port }}
 [neutron]
 url = {{ neutron_service_adminurl }}
 region_name = {{ neutron_service_region }}
+auth_plugin = password
 auth_strategy = keystone
-admin_auth_url = {{ keystone_service_adminurl }}
-admin_password = {{ neutron_service_password }}
-admin_username = {{ neutron_service_user_name }}
-admin_tenant_name = {{ neutron_service_project_name }}
+# Keystone client plugin password option
+password = {{ neutron_service_password }}
+# Keystone client plugin username option
+username = {{ neutron_service_user_name }}
+project_name = {{ neutron_service_project_name }}
+user_domain_name = {{ neutron_service_domain_name |default("Default") }}
+project_domain_name = {{ neutron_service_domain_name |default("Default") }}
+# Keystone client plugin authentication URL option
+auth_url = {{ keystone_service_adminurl }}
 metadata_proxy_shared_secret = {{ nova_metadata_proxy_secret }}
 service_metadata_proxy = {{ nova_metadata_proxy_enabled }}