diff --git a/environments/lifecycle/undercloud-upgrade-prepare.yaml b/environments/lifecycle/undercloud-upgrade-prepare.yaml
index ca993e9ea8..5ff6075dba 100644
--- a/environments/lifecycle/undercloud-upgrade-prepare.yaml
+++ b/environments/lifecycle/undercloud-upgrade-prepare.yaml
@@ -5,4 +5,4 @@ resource_registry:
 
 parameter_defaults:
   UndercloudUpgrade: true
-  DnfStreams: [{'module':'container-tools', 'stream':'3.0', 'distribution_version':'8'}]
+  DnfStreams: [{'module':'container-tools', 'stream':'rhel8', 'distribution_version':'8'}]
diff --git a/environments/lifecycle/update-prepare.yaml b/environments/lifecycle/update-prepare.yaml
index f6401e6439..c88fedcafb 100644
--- a/environments/lifecycle/update-prepare.yaml
+++ b/environments/lifecycle/update-prepare.yaml
@@ -7,4 +7,4 @@ resource_registry:
 
 parameter_defaults:
   CephAnsiblePlaybook: default
-  DnfStreams: [{'module':'container-tools', 'stream':'3.0', 'distribution_version':'8'}]
+  DnfStreams: [{'module':'container-tools', 'stream':'rhel8', 'distribution_version':'8'}]
diff --git a/environments/lifecycle/upgrade-prepare.yaml b/environments/lifecycle/upgrade-prepare.yaml
index 40cf494540..2bb51eb0bb 100644
--- a/environments/lifecycle/upgrade-prepare.yaml
+++ b/environments/lifecycle/upgrade-prepare.yaml
@@ -16,4 +16,4 @@ parameter_defaults:
   UpgradeInitCommonCommand: |
     #!/bin/bash
     set -eu
-  DnfStreams: [{'module':'container-tools', 'stream':'3.0', 'distribution_version':'8'}]
+  DnfStreams: [{'module':'container-tools', 'stream':'rhel8', 'distribution_version':'8'}]