diff --git a/deployment/rhsm/rhsm-baremetal-ansible.yaml b/deployment/rhsm/rhsm-baremetal-ansible.yaml
index d5202805c3..8a635be6f5 100644
--- a/deployment/rhsm/rhsm-baremetal-ansible.yaml
+++ b/deployment/rhsm/rhsm-baremetal-ansible.yaml
@@ -47,12 +47,12 @@ resources:
     properties:
       type: json
       value:
-        map_replace:
-          - map_replace:
-            - vars: RhsmVars
-            - values: {get_param: [RoleParameters]}
-          - values:
-              RhsmVars: {get_param: RhsmVars}
+        map_merge:
+          - rhsm_disable_container_check: true
+          - if:
+              - not: {equals: [{get_param: [RoleParameters, RhsmVars]}, '']}
+              - {get_param: [RoleParameters, RhsmVars]}
+              - {get_param: RhsmVars}
 
 outputs:
   role_data:
@@ -63,7 +63,7 @@ outputs:
         - name: Red Hat Subscription Management configuration during deployment
           import_role:
             name: redhat-subscription
-          vars: {get_attr: [RoleParametersValue, value, vars]}
+          vars: {get_attr: [RoleParametersValue, value]}
       scale_tasks:
         - name: Red Hat Subscription Management configuration during scale-down
           tags: down
@@ -71,13 +71,14 @@ outputs:
           import_role:
             name: redhat-subscription
             tasks_from: unregister
+          vars: {get_attr: [RoleParametersValue, value]}
       upgrade_tasks:
         - name: Red Hat Subscription Management configuration
           import_role:
             name: redhat-subscription
           vars:
             map_merge:
-              - {get_attr: [RoleParametersValue, value, vars]}
+              - {get_attr: [RoleParametersValue, value]}
               # Force only rhsm_repos content to be enabled.
               - rhsm_repos_purge: True
               - rhsm_force_register: True