diff --git a/tasks/glance_service_setup.yml b/tasks/glance_service_setup.yml
index e061d721..f2c12705 100644
--- a/tasks/glance_service_setup.yml
+++ b/tasks/glance_service_setup.yml
@@ -17,8 +17,10 @@
 - name: Ensure glance 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: "{{ glance_service_name }}"
     service_type: "{{ glance_service_type }}"
     description: "{{ glance_service_description }}"
@@ -36,8 +38,10 @@
 - name: Ensure glance 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: "{{ glance_service_user_name }}"
     tenant_name: "{{ glance_service_project_name }}"
     password: "{{ glance_service_password }}"
@@ -56,8 +60,10 @@
 - name: Ensure glance 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: "{{ glance_service_user_name }}"
     tenant_name: "{{ glance_service_project_name }}"
     role_name: "{{ glance_role_name }}"
@@ -76,8 +82,10 @@
 - name: Ensure glance 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: "{{ glance_service_region }}"
     service_name: "{{ glance_service_name }}"
     service_type: "{{ glance_service_type }}"
diff --git a/tests/test.yml b/tests/test.yml
index 9275ed89..95d6b958 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -291,7 +291,8 @@
     rabbitmq_servers: 10.100.100.2
     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