diff --git a/tasks/designate_service_setup.yml b/tasks/designate_service_setup.yml
index d3534d3..0539941 100644
--- a/tasks/designate_service_setup.yml
+++ b/tasks/designate_service_setup.yml
@@ -16,8 +16,10 @@
 - name: Ensure designate 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: "{{ designate_service_name }}"
     service_type: "{{ designate_service_type }}"
     description: "{{ designate_service_description }}"
@@ -33,8 +35,10 @@
 - name: Ensure designate 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: "{{ designate_service_user_name }}"
     tenant_name: "{{ designate_service_project_name }}"
     password: "{{ designate_service_password }}"
@@ -51,8 +55,10 @@
 - name: Ensure designate 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: "{{ designate_service_user_name }}"
     tenant_name: "{{ designate_service_project_name }}"
     role_name: "{{ designate_role_name }}"
@@ -72,8 +78,10 @@
 - name: Ensure designate 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: "{{ designate_service_region }}"
     service_name: "{{ designate_service_name }}"
     service_type: "{{ designate_service_type }}"
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
index de1a2d2..e33e55b 100644
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@@ -32,6 +32,8 @@ keystone_galera_address: 10.100.100.101
 keystone_galera_database: keystone
 keystone_container_mysql_password: "SuperSecrete"
 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