diff --git a/puppet/services/messaging/notify-rabbitmq.yaml b/puppet/services/messaging/notify-rabbitmq.yaml
index 360b8c8104..39c9ac8663 100644
--- a/puppet/services/messaging/notify-rabbitmq.yaml
+++ b/puppet/services/messaging/notify-rabbitmq.yaml
@@ -139,7 +139,7 @@ outputs:
         if:
           - internal_tls_enabled
           -
-            - service: oslo_messaging_notify
+            - service: rabbitmq
               network: {get_param: [ServiceNetMap, OsloMessagingNotifyNetwork]}
               type: node
           - null
diff --git a/puppet/services/messaging/rpc-rabbitmq.yaml b/puppet/services/messaging/rpc-rabbitmq.yaml
index f726db5282..093aae56d7 100644
--- a/puppet/services/messaging/rpc-rabbitmq.yaml
+++ b/puppet/services/messaging/rpc-rabbitmq.yaml
@@ -140,7 +140,7 @@ outputs:
         if:
           - internal_tls_enabled
           -
-            - service: oslo_messaging_rpc
+            - service: rabbitmq
               network: {get_param: [ServiceNetMap, OsloMessagingRpcNetwork]}
               type: node
           - null