diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml
index aeb958b28..0be6c543b 100644
--- a/config/general_config/featureset017.yml
+++ b/config/general_config/featureset017.yml
@@ -119,3 +119,25 @@ tempest_extra_config: >-
 # This is a workaround to have test_volume_boot_pattern passing, it's failing
 # due a concurrency, for more information, check lp 1744151
 tempest_workers: 1
+
+deployed_server: >-
+  {% if release in ['newton','ocata','pike','queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+deploy_steps_ansible_workflow: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+config_download_args: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
+  -e {{ working_dir }}/config-download.yaml
+  --config-download
+  --deployed-server
+  --disable-validations
+  --verbose
+  {%- endif -%}
diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml
index ded053fdc..cccd75ea5 100644
--- a/config/general_config/featureset018.yml
+++ b/config/general_config/featureset018.yml
@@ -93,3 +93,25 @@ tempest_plugins: >-
   {% if release not in ['newton', 'ocata', 'pike'] -%}{{ tempest_plugins_new }}
   {%- else -%}{{ tempest_plugins_old }}
   {%- endif -%}
+
+deployed_server: >-
+  {% if release in ['newton','ocata','pike','queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+deploy_steps_ansible_workflow: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+config_download_args: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
+  -e {{ working_dir }}/config-download.yaml
+  --config-download
+  --deployed-server
+  --disable-validations
+  --verbose
+  {%- endif -%}
diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
index ba9900599..aec9e8955 100644
--- a/config/general_config/featureset030.yml
+++ b/config/general_config/featureset030.yml
@@ -38,3 +38,25 @@ run_tempest: true
 test_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
+
+deployed_server: >-
+  {% if release in ['newton','ocata','pike','queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+deploy_steps_ansible_workflow: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
+config_download_args: >-
+  {% if release not in ['newton','ocata','pike','queens'] -%}
+  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
+  -e {{ working_dir }}/config-download.yaml
+  --config-download
+  --deployed-server
+  --disable-validations
+  --verbose
+  {%- endif -%}