diff --git a/environments/rhsm.yaml b/environments/rhsm.yaml
index 01abf5a332..b2d7222a20 100644
--- a/environments/rhsm.yaml
+++ b/environments/rhsm.yaml
@@ -6,14 +6,17 @@ resource_registry:
 parameter_defaults:
 # RhsmVars:
 #   rhsm_repos:
-#     - rhel-7-server-rpms
-#     - rhel-7-server-extras-rpms
-#     - rhel-ha-for-rhel-7-server-rpms
-#     - rhel-7-server-openstack-13-rpms
-#     - rhel-7-server-rhceph-3-mon-rpms
-#     - rhel-7-server-rhceph-3-tools-rpms
+#     - rhel-8-for-x86_64-baseos-eus-rpms
+#     - rhel-8-for-x86_64-appstream-eus-rpms
+#     - rhel-8-for-x86_64-highavailability-eus-rpms
+#     - ansible-2.9-for-rhel-8-x86_64-rpms
+#     - advanced-virt-for-rhel-8-x86_64-rpms
+#     - openstack-16.1-for-rhel-8-x86_64-rpms
+#     - fast-datapath-for-rhel-8-x86_64-rpms
+#     - rhceph-4-tools-for-rhel-8-x86_64-rpms
+#     - rhceph-4-mon-for-rhel-8-x86_64-rpms
 #   rhsm_activation_key: 'secrete-key'
-#   rhsm_release: '8.1'
+#   rhsm_release: '8.2'
 
 
 # In some cases, you want to configure specific repos on some roles.
@@ -22,15 +25,17 @@ parameter_defaults:
 # ComputeHCIParameters:
 #   RhsmVars:
 #     rhsm_repos:
-#       - rhel-7-server-rpms
-#       - rhel-7-server-extras-rpms
-#       - rhel-ha-for-rhel-7-server-rpms
-#       - rhel-7-server-openstack-13-rpms
-#       - rhel-7-server-rhceph-3-osd-rpms
-#       - rhel-7-server-rhceph-3-mon-rpms
-#       - rhel-7-server-rhceph-3-tools-rpms
+#       - rhel-8-for-x86_64-baseos-eus-rpms
+#       - rhel-8-for-x86_64-appstream-eus-rpms
+#       - rhel-8-for-x86_64-highavailability-eus-rpms
+#       - ansible-2.9-for-rhel-8-x86_64-rpms
+#       - advanced-virt-for-rhel-8-x86_64-rpms
+#       - openstack-16.1-for-rhel-8-x86_64-rpms
+#       - fast-datapath-for-rhel-8-x86_64-rpms
+#       - rhceph-4-tools-for-rhel-8-x86_64-rpms
+#       - rhceph-4-mon-for-rhel-8-x86_64-rpms
 #     rhsm_activation_key: 'anothersecrete-key'
-#     rhsm_release: '8.1'
+#     rhsm_release: '8.2'
 #
 # More about composable roles:
 # https://docs.openstack.org/tripleo-docs/latest/install/advanced_deployment/role_specific_parameters.html