diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml
index 75448a5c0f..1a7fd29bc1 100644
--- a/deployed-server/deployed-server.yaml
+++ b/deployed-server/deployed-server.yaml
@@ -48,6 +48,8 @@ parameters:
       Command or script snippet to run on all overcloud nodes to
       initialize the upgrade process. E.g. a repository switch.
     default: ''
+    tags:
+      - role_specific
   UpgradeInitCommonCommand:
     type: string
     description: |
diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 374919478f..4276c01e3c 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -48,6 +48,8 @@ parameters:
       development/testing. For example, LEAPP_DEVEL_SKIP_RHSM=1.
     type: string
     default: ''
+    tags:
+      - role_specific
   UpgradeLeappCommandOptions:
     description: |
       In case or using UpgradeLeappDevelSkip with LEAPP_NO_RHSM=1 user
@@ -55,6 +57,8 @@ parameters:
       leapp to use these repositories for the upgrade process.
     type: string
     default: ''
+    tags:
+      - role_specific
   UpgradeLeappRebootTimeout:
     description: Timeout (seconds) for the OS upgrade phase via Leapp
     type: number
@@ -69,16 +73,22 @@ parameters:
     default: []
     description: List of packages to remove during Leapp upgrade.
     type: comma_delimited_list
+    tags:
+      - role_specific
   UpgradeLeappToInstall:
     default: []
     description: List of packages to install after Leapp upgrade.
     type: comma_delimited_list
+    tags:
+      - role_specific
   UpgradeInitCommand:
     type: string
     description: |
       Command or script snippet to run on all overcloud nodes to
       initialize the upgrade process. E.g. a repository switch.
     default: ''
+    tags:
+      - role_specific
   UpgradeInitCommonCommand:
     type: string
     description: |
@@ -104,6 +114,8 @@ parameters:
              module[mandatory], stream[mandatory] and profile[optional]. If the profile
              is not specified 'common' will be used instead.
     type: json
+    tags:
+      - role_specific
 
 resources:
   RoleParametersValue:
@@ -114,6 +126,7 @@ resources:
         map_replace:
           - map_replace:
             - dnf_module_list: DnfStreams
+              upgrade_leapp_devel_skip: UpgradeLeappDevelSkip
               upgrade_leapp_command_options: UpgradeLeappCommandOptions
               upgrade_leapp_to_remove: UpgradeLeappToRemove
               upgrade_leapp_to_install: UpgradeLeappToInstall
@@ -121,6 +134,7 @@ resources:
             - values: {get_param: [RoleParameters]}
           - values:
               DnfStreams: {get_param: DnfStreams}
+              UpgradeLeappDevelSkip: {get_param: UpgradeLeappDevelSkip}
               UpgradeLeappCommandOptions: {get_param: UpgradeLeappCommandOptions}
               UpgradeLeappToRemove: {get_param: UpgradeLeappToRemove}
               UpgradeLeappToInstall: {get_param: UpgradeLeappToInstall}
@@ -155,7 +169,7 @@ outputs:
                  ansible_facts['distribution'] == 'RedHat' and
                  ansible_facts['distribution_major_version'] is version('7', '==') }}
             upgrade_leapp_debug: {get_param: UpgradeLeappDebug}
-            upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip}
+            upgrade_leapp_devel_skip: {get_attr: [RoleParametersValue, value, 'upgrade_leapp_devel_skip']}
             upgrade_leapp_command_options: {get_attr: [RoleParametersValue, value, 'upgrade_leapp_command_options']}
             upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
             upgrade_leapp_post_reboot_delay: {get_param: UpgradeLeappPostRebootDelay}
diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml
index 572233d920..42647b0a56 100644
--- a/deployment/undercloud/undercloud-upgrade.yaml
+++ b/deployment/undercloud/undercloud-upgrade.yaml
@@ -43,6 +43,8 @@ parameters:
              module[mandatory], stream[mandatory] and profile[optional]. If the profile
              is not specified 'common' will be used instead.
     type: json
+    tags:
+      - role_specific
 
 outputs:
   role_data:
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index e2a2fdb08a..e0fe7ccea2 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -139,6 +139,8 @@ parameters:
       Command or script snippet to run on all overcloud nodes to
       initialize the upgrade process. E.g. a repository switch.
     default: ''
+    tags:
+      - role_specific
   UpgradeInitCommonCommand:
     type: string
     description: |
diff --git a/releasenotes/notes/upgradeleapp-per-role-ad2e84e317ec1291.yaml b/releasenotes/notes/upgradeleapp-per-role-ad2e84e317ec1291.yaml
new file mode 100644
index 0000000000..9deb77ca5f
--- /dev/null
+++ b/releasenotes/notes/upgradeleapp-per-role-ad2e84e317ec1291.yaml
@@ -0,0 +1,6 @@
+---
+other:
+  - |
+    These parameters can now be set per-role - DnfStreams, UpgradeInitCommand,
+    UpgradeLeappCommandOptions, UpgradeLeappDevelSkip, UpgradeLeappToRemove,
+    UpgradeLeappToInstall