diff --git a/config/general_config/featureset026.yml b/config/general_config/featureset026.yml
index 45637bb8f..2586ea307 100644
--- a/config/general_config/featureset026.yml
+++ b/config/general_config/featureset026.yml
@@ -17,7 +17,9 @@ extra_args: >-
   --ntp-server pool.ntp.org
 
 container_args: >-
+  {% if release in ['pike','queens'] -%}
   -e {{ overcloud_templates_path }}/environments/docker.yaml
+  {%- endif -%}
   -e {{ working_dir }}/containers-default-parameters.yaml
   -e {{ overcloud_templates_path }}/environments/kubernetes.yaml
 
diff --git a/config/general_config/featureset033.yml b/config/general_config/featureset033.yml
index 46b42b96e..3211da4ed 100644
--- a/config/general_config/featureset033.yml
+++ b/config/general_config/featureset033.yml
@@ -22,7 +22,9 @@ extra_args: >-
   --ntp-server pool.ntp.org
 
 container_args: >-
+  {% if release in ['pike','queens'] -%}
   -e {{ overcloud_templates_path }}/environments/docker.yaml
+  {%- endif -%}
   -e {{ working_dir }}/containers-default-parameters.yaml
   -e {{ overcloud_templates_path }}/environments/openshift.yaml