diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml
index f461b4442..dead996ac 100644
--- a/config/general_config/featureset001.yml
+++ b/config/general_config/featureset001.yml
@@ -135,9 +135,3 @@ deploy_steps_ansible_workflow: >-
   {%- else -%}
   false
   {%- endif -%}
-config_download_args: >-
-  {% if release not in ['newton','ocata','pike'] -%}
-  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
-  --config-download
-  --verbose
-  {%- endif -%}
diff --git a/config/general_config/featureset002.yml b/config/general_config/featureset002.yml
index 38b8d7902..7af51de07 100644
--- a/config/general_config/featureset002.yml
+++ b/config/general_config/featureset002.yml
@@ -94,9 +94,3 @@ deploy_steps_ansible_workflow: >-
   {%- 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
-  --config-download
-  --verbose
-  {%- endif -%}
diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml
index d977a479a..b0e333364 100644
--- a/config/general_config/featureset010.yml
+++ b/config/general_config/featureset010.yml
@@ -54,10 +54,7 @@ deploy_steps_ansible_workflow: >-
   {%- endif -%}
 config_download_args: >-
   {% if release not in ['newton','ocata','pike'] -%}
-  -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/featureset016.yml b/config/general_config/featureset016.yml
index 92a187fc8..c81823cc8 100644
--- a/config/general_config/featureset016.yml
+++ b/config/general_config/featureset016.yml
@@ -124,10 +124,7 @@ deploy_steps_ansible_workflow: >-
   {%- 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/featureset017.yml b/config/general_config/featureset017.yml
index b77e80899..4515a66f3 100644
--- a/config/general_config/featureset017.yml
+++ b/config/general_config/featureset017.yml
@@ -134,10 +134,7 @@ deploy_steps_ansible_workflow: >-
   {%- 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 8eb7644df..5c417bc0b 100644
--- a/config/general_config/featureset018.yml
+++ b/config/general_config/featureset018.yml
@@ -108,10 +108,7 @@ deploy_steps_ansible_workflow: >-
   {%- 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/featureset020.yml b/config/general_config/featureset020.yml
index ef715c816..1497f0bde 100644
--- a/config/general_config/featureset020.yml
+++ b/config/general_config/featureset020.yml
@@ -70,9 +70,3 @@ deploy_steps_ansible_workflow: >-
   {%- 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
-  --config-download
-  --verbose
-  {%- endif -%}
diff --git a/config/general_config/featureset026.yml b/config/general_config/featureset026.yml
index 2586ea307..019cc7f24 100644
--- a/config/general_config/featureset026.yml
+++ b/config/general_config/featureset026.yml
@@ -24,10 +24,7 @@ container_args: >-
   -e {{ overcloud_templates_path }}/environments/kubernetes.yaml
 
 config_download_args: >-
-  -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
 
diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
index 42f8d01fa..3a1a17d55 100644
--- a/config/general_config/featureset030.yml
+++ b/config/general_config/featureset030.yml
@@ -57,10 +57,7 @@ deploy_steps_ansible_workflow: >-
   {%- 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/featureset032.yml b/config/general_config/featureset032.yml
index a3110314f..dc3a05655 100644
--- a/config/general_config/featureset032.yml
+++ b/config/general_config/featureset032.yml
@@ -40,10 +40,7 @@ deploy_steps_ansible_workflow: >-
   {%- endif -%}
 config_download_args: >-
   {% if release not in ['newton','ocata','pike'] -%}
-  -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/featureset033.yml b/config/general_config/featureset033.yml
index 3211da4ed..4930a9229 100644
--- a/config/general_config/featureset033.yml
+++ b/config/general_config/featureset033.yml
@@ -30,10 +30,7 @@ container_args: >-
 
 deploy_steps_ansible_workflow: true
 config_download_args: >-
-  -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
 
diff --git a/config/general_config/featureset035.yml b/config/general_config/featureset035.yml
index 04816fb7c..fbb2d419d 100644
--- a/config/general_config/featureset035.yml
+++ b/config/general_config/featureset035.yml
@@ -72,9 +72,3 @@ deploy_steps_ansible_workflow: >-
   {%- 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
-  --config-download
-  --verbose
-  {%- endif -%}
diff --git a/config/general_config/featureset037.yml b/config/general_config/featureset037.yml
index 303c14280..3bb8470bb 100644
--- a/config/general_config/featureset037.yml
+++ b/config/general_config/featureset037.yml
@@ -53,10 +53,7 @@ overcloud_roles:
 deploy_steps_ansible_workflow: true
 config_download_args: >-
   {% if release not in ['newton','ocata','pike'] -%}
-  -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/featureset042.yml b/config/general_config/featureset042.yml
index a249fcb4e..13f0d169f 100644
--- a/config/general_config/featureset042.yml
+++ b/config/general_config/featureset042.yml
@@ -68,7 +68,3 @@ tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 
 deploy_steps_ansible_workflow: true
-config_download_args: >-
-  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
-  --config-download
-  --verbose
diff --git a/config/general_config/minimal.yml b/config/general_config/minimal.yml
index 13ac71f54..f1c61919b 100644
--- a/config/general_config/minimal.yml
+++ b/config/general_config/minimal.yml
@@ -89,9 +89,3 @@ deploy_steps_ansible_workflow: >-
   {%- else -%}
   false
   {%- endif -%}
-config_download_args: >-
-  {% if release not in ['newton','ocata','pike'] -%}
-  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
-  --config-download
-  --verbose
-  {%- endif -%}
diff --git a/config/general_config/pacemaker.yml b/config/general_config/pacemaker.yml
index bdc691e9e..d8f135776 100644
--- a/config/general_config/pacemaker.yml
+++ b/config/general_config/pacemaker.yml
@@ -95,9 +95,3 @@ deploy_steps_ansible_workflow: >-
   {%- else -%}
   false
   {%- endif -%}
-config_download_args: >-
-  {% if release not in ['newton','ocata','pike'] -%}
-  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
-  --config-download
-  --verbose
-  {%- endif -%}