diff --git a/config/general_config/featureset036.yml b/config/general_config/featureset036.yml
index c40512bc3..8ab9169fd 100644
--- a/config/general_config/featureset036.yml
+++ b/config/general_config/featureset036.yml
@@ -57,13 +57,10 @@ use_oooq: true
 # Run prep container before upgrade.
 prep_container_upgrade_run: true
 containerized_overcloud_upgrade: true
-# Need to update once stein is released
-container_registry_file: >-
-  {% if release not in ['ocata','pike','queens','rocky'] -%}
-  containers-prepare-parameter.yaml
-  {%- else -%}
-  containers-default-parameters.yaml
-  {%- endif -%}
+# container_registry_file is used pre-rocky, after rocky
+# is uc_containers_prepare_file the one used to identify
+# the containers file (defaults to: containers-prepare-parameter.yaml)
+container_registry_file: containers-default-parameters.yaml
 
 # Adjust user to CI
 overcloud_ssh_user: "zuul"
diff --git a/config/general_config/featureset037.yml b/config/general_config/featureset037.yml
index cd1705f9d..a283febfb 100644
--- a/config/general_config/featureset037.yml
+++ b/config/general_config/featureset037.yml
@@ -12,13 +12,10 @@ overcloud_update: true
 # updating the container images too. (This might have to be paired
 # with some work on the image building side to get meaningful
 # from-to combination of images.
-# Need to update once stein is released
-container_registry_file: >-
-  {% if release not in ['ocata','pike','queens','rocky'] -%}
-  containers-prepare-parameter.yaml
-  {%- else -%}
-  containers-default-parameters.yaml
-  {%- endif -%}
+# container_registry_file is used pre-rocky, after rocky
+# is uc_containers_prepare_file the one used to identify
+# the containers file (defaults to: containers-prepare-parameter.yaml)
+container_registry_file: containers-default-parameters.yaml
 tripleo_upgrade_validations_non_fatal: true
 tripleo_upgrade_debug: true
 # Reduce CI wall time
diff --git a/config/general_config/featureset040.yml b/config/general_config/featureset040.yml
index 1501d01a4..05f32c356 100644
--- a/config/general_config/featureset040.yml
+++ b/config/general_config/featureset040.yml
@@ -37,13 +37,10 @@ create_container_images_download_script: false
 # do not run workload test
 launch_sanity_workload: false
 
-# Need to update once stein is released
-container_registry_file: >-
-  {% if release not in ['ocata','pike','queens','rocky'] -%}
-  containers-prepare-parameter.yaml
-  {%- else -%}
-  containers-default-parameters.yaml
-  {%- endif -%}
+# container_registry_file is used pre-rocky, after rocky
+# is uc_containers_prepare_file the one used to identify
+# the containers file (defaults to: containers-prepare-parameter.yaml)
+container_registry_file: containers-default-parameters.yaml
 tripleo_ci: true
 use_oooq: true
 tripleo_upgrade_debug: true
diff --git a/config/general_config/featureset051.yml b/config/general_config/featureset051.yml
index bbe42106a..77e604ae9 100644
--- a/config/general_config/featureset051.yml
+++ b/config/general_config/featureset051.yml
@@ -44,13 +44,10 @@ create_container_images_download_script: false
 # do not run workload test
 launch_sanity_workload: false
 
-# Need to update once stein is released
-container_registry_file: >-
-  {% if release not in ['ocata','pike','queens','rocky'] -%}
-  containers-prepare-parameter.yaml
-  {%- else -%}
-  containers-default-parameters.yaml
-  {%- endif -%}
+# container_registry_file is used pre-rocky, after rocky
+# is uc_containers_prepare_file the one used to identify
+# the containers file (defaults to: containers-prepare-parameter.yaml)
+container_registry_file: containers-default-parameters.yaml
 tripleo_ci: true
 use_oooq: true
 tripleo_upgrade_debug: true