diff --git a/roles/populate-manilaclient-config/tasks/main.yaml b/roles/populate-manilaclient-config/tasks/main.yaml
index f94593421..aa94e217b 100644
--- a/roles/populate-manilaclient-config/tasks/main.yaml
+++ b/roles/populate-manilaclient-config/tasks/main.yaml
@@ -17,7 +17,7 @@
 
       source {{ base_dir }}/devstack/openrc admin demo &>/dev/null
       iniset {{ manilaclient_config }} DEFAULT admin_username $OS_USERNAME
-      iniset {{ manilaclient_config }} DEFAULT admin_tenant_name $OS_TENANT_NAME
+      iniset {{ manilaclient_config }} DEFAULT admin_tenant_name $OS_PROJECT_NAME
       iniset {{ manilaclient_config }} DEFAULT admin_password $OS_PASSWORD
       iniset {{ manilaclient_config }} DEFAULT admin_auth_url $OS_AUTH_URL
       iniset {{ manilaclient_config }} DEFAULT admin_project_domain_id $OS_PROJECT_DOMAIN_ID
diff --git a/zuul.d/python-manilaclient-jobs.yaml b/zuul.d/python-manilaclient-jobs.yaml
index a76712821..0984a95f7 100644
--- a/zuul.d/python-manilaclient-jobs.yaml
+++ b/zuul.d/python-manilaclient-jobs.yaml
@@ -82,6 +82,9 @@
         # Neutron services
         q-svc: true
         q-ovn-metadata-agent: true
+        # openstack-cli-server causes problem with credential switch in ansible
+        # task
+        openstack-cli-server: false
 
 - job:
     name: python-manilaclient-functional-fips