diff --git a/defaults/main.yml b/defaults/main.yml
index 682e06a9..74580410 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -316,6 +316,7 @@ tempest_tempestconf_pip_packages:
 tempest_tempestconf_profile:
   debug: true
   create: true
+  os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
   overrides:
diff --git a/tasks/tempestconf.yml b/tasks/tempestconf.yml
index c95c6b86..4ebaf2ea 100644
--- a/tasks/tempestconf.yml
+++ b/tasks/tempestconf.yml
@@ -42,13 +42,7 @@
     if [ -d {{ tempest_tempestconf_venv_bin }} ]; then
     . {{ tempest_tempestconf_venv_bin }}/activate
     fi
-    export OS_AUTH_URL="{{ keystone_service_internaluri }}"
-    export OS_IDENTITY_API_VERSION="3"
-    export OS_USERNAME="{{ keystone_admin_user_name }}"
-    export OS_PROJECT_NAME="{{ keystone_admin_tenant_name }}"
     discover-tempest-config --profile "{{ tempest_workspace }}/etc/profile.yaml"
-  environment:
-    OS_PASSWORD: "{{ keystone_auth_admin_password }}"
   args:
     chdir: "{{ tempest_workspace }}"
     executable: /bin/bash