diff --git a/tasks/nova_service_add.yml b/tasks/nova_service_add.yml
index 14a0d162..9f198c67 100644
--- a/tasks/nova_service_add.yml
+++ b/tasks/nova_service_add.yml
@@ -17,8 +17,10 @@
 - name: Ensure nova service
   keystone:
     command: "ensure_service"
-    token: "{{ keystone_auth_admin_token }}"
     endpoint: "{{ keystone_service_adminurl }}"
+    login_user: "{{ keystone_admin_user_name }}"
+    login_password: "{{ keystone_auth_admin_password }}"
+    login_project_name: "{{ keystone_admin_tenant_name }}"
     service_name: "{{ service_name }}"
     service_type: "{{ service_type }}"
     description: "{{ service_description }}"
@@ -36,8 +38,10 @@
 - name: Ensure nova user
   keystone:
     command: "ensure_user"
-    token: "{{ keystone_auth_admin_token }}"
     endpoint: "{{ keystone_service_adminurl }}"
+    login_user: "{{ keystone_admin_user_name }}"
+    login_password: "{{ keystone_auth_admin_password }}"
+    login_project_name: "{{ keystone_admin_tenant_name }}"
     user_name: "{{ service_user_name }}"
     tenant_name: "{{ service_tenant_name }}"
     password: "{{ service_password }}"
@@ -56,8 +60,10 @@
 - name: Ensure nova user to admin role
   keystone:
     command: "ensure_user_role"
-    token: "{{ keystone_auth_admin_token }}"
     endpoint: "{{ keystone_service_adminurl }}"
+    login_user: "{{ keystone_admin_user_name }}"
+    login_password: "{{ keystone_auth_admin_password }}"
+    login_project_name: "{{ keystone_admin_tenant_name }}"
     user_name: "{{ service_user_name }}"
     tenant_name: "{{ service_tenant_name }}"
     role_name: "{{ nova_service_role_name }}"
@@ -76,8 +82,10 @@
 - name: Ensure nova endpoint
   keystone:
     command: "ensure_endpoint"
-    token: "{{ keystone_auth_admin_token }}"
     endpoint: "{{ keystone_service_adminurl }}"
+    login_user: "{{ keystone_admin_user_name }}"
+    login_password: "{{ keystone_auth_admin_password }}"
+    login_project_name: "{{ keystone_admin_tenant_name }}"
     region_name: "{{ service_region }}"
     service_name: "{{ service_name }}"
     service_type: "{{ service_type }}"
diff --git a/tests/test.yml b/tests/test.yml
index 3adde696..17c5831b 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -286,7 +286,8 @@
     rabbitmq_servers: 10.100.100.101
     rabbitmq_use_ssl: true
     rabbitmq_port: 5671
-    keystone_auth_admin_token: "SuperSecreteTestToken"
+    keystone_admin_user_name: admin
+    keystone_admin_tenant_name: admin
     keystone_auth_admin_password: "SuperSecretePassword"
     keystone_service_adminuri_insecure: false
     keystone_service_internaluri_insecure: false