diff --git a/puppet/services/messaging/notify-rabbitmq.yaml b/puppet/services/messaging/notify-rabbitmq.yaml
index 39c9ac8663..f1bf1ebc98 100644
--- a/puppet/services/messaging/notify-rabbitmq.yaml
+++ b/puppet/services/messaging/notify-rabbitmq.yaml
@@ -112,6 +112,7 @@ outputs:
             if:
             - internal_tls_enabled
             - generate_service_certificates: true
+              tripleo::rabbitmq::service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
               tripleo::profile::base::rabbitmq::certificate_specs:
                 service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
                 service_key: '/etc/pki/tls/private/rabbitmq.key'
@@ -125,6 +126,7 @@ outputs:
                     template: "rabbitmq/%{hiera('fqdn_NETWORK')}"
                     params:
                       NETWORK: {get_param: [ServiceNetMap, OsloMessagingNotifyNetwork]}
+                postsave_cmd: "/usr/bin/certmonger-rabbitmq-refresh.sh"
             - {}
       step_config: |
         include ::tripleo::profile::base::rabbitmq
diff --git a/puppet/services/messaging/rpc-rabbitmq.yaml b/puppet/services/messaging/rpc-rabbitmq.yaml
index 093aae56d7..a4c37d8238 100644
--- a/puppet/services/messaging/rpc-rabbitmq.yaml
+++ b/puppet/services/messaging/rpc-rabbitmq.yaml
@@ -113,6 +113,7 @@ outputs:
             if:
             - internal_tls_enabled
             - generate_service_certificates: true
+              tripleo::rabbitmq::service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
               tripleo::profile::base::rabbitmq::certificate_specs:
                 service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
                 service_key: '/etc/pki/tls/private/rabbitmq.key'
@@ -126,6 +127,7 @@ outputs:
                     template: "rabbitmq/%{hiera('fqdn_NETWORK')}"
                     params:
                       NETWORK: {get_param: [ServiceNetMap, OsloMessagingRpcNetwork]}
+                postsave_cmd: "/usr/bin/certmonger-rabbitmq-refresh.sh"
             - {}
       step_config: |
         include ::tripleo::profile::base::rabbitmq
diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml
index 33bb9eb83f..64ab4963c8 100644
--- a/puppet/services/rabbitmq.yaml
+++ b/puppet/services/rabbitmq.yaml
@@ -160,6 +160,7 @@ outputs:
             if:
             - internal_tls_enabled
             - generate_service_certificates: true
+              tripleo::rabbitmq::service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
               tripleo::profile::base::rabbitmq::certificate_specs:
                 service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
                 service_key: '/etc/pki/tls/private/rabbitmq.key'
@@ -173,6 +174,7 @@ outputs:
                     template: "rabbitmq/%{hiera('fqdn_NETWORK')}"
                     params:
                       NETWORK: {get_param: [ServiceNetMap, RabbitmqNetwork]}
+                postsave_cmd: "/usr/bin/certmonger-rabbitmq-refresh.sh"
             - {}
       step_config: |
         include ::tripleo::profile::base::rabbitmq