diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml
index 01d8a0d99..d7c642172 100644
--- a/config/general_config/featureset001.yml
+++ b/config/general_config/featureset001.yml
@@ -185,7 +185,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default('omit') }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
 
 tempest_tempest_conf_overrides:
   auth.use_dynamic_credentials: 'True'
diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml
index fd12e66f3..15839ba9c 100644
--- a/config/general_config/featureset020.yml
+++ b/config/general_config/featureset020.yml
@@ -205,7 +205,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default('omit') }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
 
 check_test_whitelist:
   - 'tempest.scenario'
diff --git a/config/general_config/featureset021.yml b/config/general_config/featureset021.yml
index e05585ebb..51a8ad431 100644
--- a/config/general_config/featureset021.yml
+++ b/config/general_config/featureset021.yml
@@ -226,7 +226,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default('omit') }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
 
 # Run skiplist as whitelist
 tempest_test_whitelist: "{{ tempest_whitelist }}"
diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
index 7eda22721..5886029fc 100644
--- a/config/general_config/featureset030.yml
+++ b/config/general_config/featureset030.yml
@@ -142,6 +142,6 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default('omit') }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
 
 tempest_test_whitelist: "{{ tempest_whitelist }}"
diff --git a/config/general_config/featureset035.yml b/config/general_config/featureset035.yml
index 0bfbc4aec..85de11a3f 100644
--- a/config/general_config/featureset035.yml
+++ b/config/general_config/featureset035.yml
@@ -190,7 +190,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default('omit') }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
 
 tempest_tempest_conf_overrides:
   auth.use_dynamic_credentials: 'True'