diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml
index d2f77d85c4..38357e7a36 100644
--- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-container-puppet.yaml
@@ -92,6 +92,12 @@ parameters:
   MonitoringSubscriptionRabbitmq:
     default: 'overcloud-rabbitmq'
     type: string
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
 
 conditions:
 
@@ -282,6 +288,7 @@ outputs:
               KOLLA_BOOTSTRAP: true
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
               RABBITMQ_CLUSTER_COOKIE:
                 yaql:
                   expression: $.data.passwords.where($ != '').first()
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
index 20fa19db2f..ae3caabbaa 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
@@ -65,6 +65,12 @@ parameters:
     description: Messaging Notification client subscriber parameter to specify
                  an SSL connection to the messaging host.
     type: string
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
 
 conditions:
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@@ -226,6 +232,7 @@ outputs:
               KOLLA_BOOTSTRAP: true
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
               RABBITMQ_CLUSTER_COOKIE:
                 yaql:
                   expression: $.data.passwords.where($ != '').first()
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
index 89fe745ce6..1401a9cbc6 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@@ -182,6 +182,7 @@ outputs:
               KOLLA_BOOTSTRAP: true
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
               RABBITMQ_CLUSTER_COOKIE:
                 yaql:
                   expression: $.data.passwords.where($ != '').first()
diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
index e187e8ea4b..01451c6a73 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@@ -182,6 +182,7 @@ outputs:
               KOLLA_BOOTSTRAP: true
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
               RABBITMQ_CLUSTER_COOKIE:
                 yaql:
                   expression: $.data.passwords.where($ != '').first()
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
index d727820ae6..fa42b93f81 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
@@ -66,6 +66,12 @@ parameters:
         Messaging client subscriber parameter to specify
         an SSL connection to the messaging host.
     type: string
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
 
 conditions:
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@@ -226,6 +232,7 @@ outputs:
               KOLLA_BOOTSTRAP: true
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
               RABBITMQ_CLUSTER_COOKIE:
                 yaql:
                   expression: $.data.passwords.where($ != '').first()
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
index 917402e97f..abd408edfe 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@@ -236,6 +236,7 @@ outputs:
               KOLLA_BOOTSTRAP: true
               # NOTE: this should force this container to re-run on each
               # update (scale-out, etc.)
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
               RABBITMQ_CLUSTER_COOKIE:
                 yaql:
                   expression: $.data.passwords.where($ != '').first()