diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 4c09e0cc51..fee0a32954 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -105,6 +105,19 @@ parameters:
              is not specified 'common' will be used instead.
     type: json
 
+resources:
+  RoleParametersValue:
+    type: OS::Heat::Value
+    properties:
+      type: json
+      value:
+        map_replace:
+          - map_replace:
+            - dnf_module_list: DnfStreams
+            - values: {get_param: [RoleParameters]}
+          - values:
+              DnfStreams: {get_param: DnfStreams}
+
 outputs:
   role_data:
     description: Role data for the TripleO package settings
@@ -239,7 +252,7 @@ outputs:
                     - {get_param: UpgradeInitCommonCommand}
             - name: Ensure DNF modules have the right stream
               vars:
-                dnf_module_list: {get_param: DnfStreams}
+                dnf_module_list: {get_attr: [RoleParametersValue, value, 'dnf_module_list']}
               dnf:
                 name: "@{{ item.module }}:{{ item.stream }}/{{ item.profile|default('common') }}"
                 state: present
@@ -338,7 +351,7 @@ outputs:
             - not (skip_rhel_enforcement | bool)
         - name: Ensure DNF modules have the right stream
           vars:
-            dnf_module_list: {get_param: DnfStreams}
+            dnf_module_list: {get_attr: [RoleParametersValue, value, 'dnf_module_list']}
           dnf:
             name: "@{{ item.module }}:{{ item.stream }}/{{ item.profile|default('common') }}"
             state: present