diff --git a/deployment/tuned/tuned-baremetal-ansible.yaml b/deployment/tuned/tuned-baremetal-ansible.yaml
index affe201f1d..2cea8dda48 100644
--- a/deployment/tuned/tuned-baremetal-ansible.yaml
+++ b/deployment/tuned/tuned-baremetal-ansible.yaml
@@ -45,6 +45,21 @@ parameters:
     tags:
       - role_specific
 
+resources:
+  RoleParametersValue:
+    type: OS::Heat::Value
+    properties:
+      type: json
+      value:
+        map_replace:
+          - map_replace:
+            - tuned_profile: TunedProfileName
+              tuned_custom_profile: TunedCustomProfile
+            - values: {get_param: [RoleParameters]}
+          - values:
+              TunedProfileName: {get_param: TunedProfileName}
+              TunedCustomProfile: {get_param: TunedCustomProfile}
+
 outputs:
   role_data:
     description: Role data for tuned
@@ -54,5 +69,5 @@ outputs:
         - include_role:
             name: tuned
       ansible_group_vars:
-        tuned_profile: {get_param: TunedProfileName}
-        tuned_custom_profile: {get_param: TunedCustomProfile}
+        tuned_profile: {get_attr: [RoleParametersValue, value, tuned_profile]}
+        tuned_custom_profile: {get_attr: [RoleParametersValue, value, tuned_custom_profile]}