diff --git a/defaults/main.yml b/defaults/main.yml
index cf16eb9d..096b0c38 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -287,8 +287,13 @@ tempest_tempestconf_developer_constraints:
   - "git+{{ tempest_tempestconf_git_repo }}@{{ tempest_tempestconf_git_install_branch }}#egg=python_tempestconf"
 tempest_tempestconf_pip_packages:
   - python-tempestconf
-tempest_tempestconf_extra_cli_call_overrides:
-  auth.use_dynamic_credentials: true
+tempest_tempestconf_profile:
+  debug: true
+  create: true
+  out: "{{ tempest_workspace }}/etc/tempest.conf"
+  network-id: "{{ tempest_neutron_public_network_id }}"
+  overrides:
+     auth.use_dynamic_credentials: true
 
 # Stackviz tarball url
 stackviz_tarball: "https://tarballs.openstack.org/package-stackviz-element/stackviz-latest.tar.gz"
diff --git a/tasks/tempestconf.yml b/tasks/tempestconf.yml
index 93aacf2a..c95c6b86 100644
--- a/tasks/tempestconf.yml
+++ b/tasks/tempestconf.yml
@@ -31,6 +31,11 @@
     venv_pip_packages: "{{ tempest_tempestconf_pip_packages }}"
   when: tempest_install_method == 'source'
 
+- name: Override tempestconf profile
+  copy:
+    content: "{{ tempest_tempestconf_profile | to_nice_yaml }}"
+    dest: "{{ tempest_workspace }}/etc/profile.yaml"
+
 - name: Executing python-tempestconf
   shell: |
     set -e
@@ -41,13 +46,7 @@
     export OS_IDENTITY_API_VERSION="3"
     export OS_USERNAME="{{ keystone_admin_user_name }}"
     export OS_PROJECT_NAME="{{ keystone_admin_tenant_name }}"
-    discover-tempest-config --out etc/tempest.conf \
-      --network-id "{{ tempest_neutron_public_network_id }}" \
-      --create \
-      {% for key, value in tempest_tempestconf_extra_cli_call_overrides.items() %}
-      {{ key }} {{ value }} \
-      {% endfor %}
-      --debug
+    discover-tempest-config --profile "{{ tempest_workspace }}/etc/profile.yaml"
   environment:
     OS_PASSWORD: "{{ keystone_auth_admin_password }}"
   args: