diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml
index c34670dc2..fbe58d67e 100644
--- a/config/general_config/featureset001.yml
+++ b/config/general_config/featureset001.yml
@@ -75,6 +75,9 @@ extra_args: >-
    {% if release not in ['newton', 'ocata', 'pike'] %}
    -e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
    {% endif %}
+   {% if release not in ['newton','ocata','pike','queens','rocky','stein','train'] -%}
+   --disable-validations
+   {%- endif -%}
 
 undercloud_ntp_servers: pool.ntp.org
 # keep the doc gen settings at the bottom of the config file.
@@ -208,3 +211,10 @@ undercloud_enable_tempest: >-
 
 
 tempest_extra_config: {'compute_feature_enabled.config_drive': 'True'}
+
+baremetal_provision: >-
+  {% if release in ['newton','ocata','pike','queens','rocky','stein','train'] -%}
+  false
+  {%- else -%}
+  true
+  {%- endif -%}
diff --git a/config/general_config/featureset053.yml b/config/general_config/featureset053.yml
index d63b0ff3c..e3b15ec3d 100644
--- a/config/general_config/featureset053.yml
+++ b/config/general_config/featureset053.yml
@@ -75,6 +75,9 @@ extra_args: >-
    {% if release not in ['newton', 'ocata', 'pike'] %}
    -e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
    {% endif %}
+   {% if release not in ['newton','ocata','pike','queens','rocky','stein','train'] -%}
+   --disable-validations
+   {%- endif -%}
 
 # keep the doc gen settings at the bottom of the config file.
 # options below direct automatic doc generation by tripleo-collect-logs
@@ -162,3 +165,10 @@ grafana_enabled: false
 statsd_enabled: false
 rsyslog_forwarding: false
 browbeat_config_file: browbeat-minimal-ci.yaml.j2
+
+baremetal_provision: >-
+  {% if release in ['newton','ocata','pike','queens','rocky','stein','train'] -%}
+  false
+  {%- else -%}
+  true
+  {%- endif -%}