diff --git a/heat/values.yaml b/heat/values.yaml
index 6f17299f71..737df6933d 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -300,6 +300,7 @@ dependencies:
     api:
       jobs:
         - heat-db-sync
+        - heat-rabbit-init
         - heat-ks-user
         - heat-trustee-ks-user
         - heat-domain-ks-user
@@ -307,11 +308,14 @@ dependencies:
       services:
         - endpoint: internal
           service: oslo_db
+        - endpoint: internal
+          service: oslo_messaging
         - endpoint: internal
           service: identity
     cfn:
       jobs:
         - heat-db-sync
+        - heat-rabbit-init
         - heat-ks-user
         - heat-trustee-ks-user
         - heat-domain-ks-user
@@ -319,11 +323,14 @@ dependencies:
       services:
         - endpoint: internal
           service: oslo_db
+        - endpoint: internal
+          service: oslo_messaging
         - endpoint: internal
           service: identity
     cloudwatch:
       jobs:
         - heat-db-sync
+        - heat-rabbit-init
         - heat-ks-user
         - heat-trustee-ks-user
         - heat-domain-ks-user
@@ -331,6 +338,8 @@ dependencies:
       services:
         - endpoint: internal
           service: oslo_db
+        - endpoint: internal
+          service: oslo_messaging
         - endpoint: internal
           service: identity
     db_drop:
@@ -350,6 +359,7 @@ dependencies:
     engine:
       jobs:
         - heat-db-sync
+        - heat-rabbit-init
         - heat-ks-user
         - heat-trustee-ks-user
         - heat-domain-ks-user
@@ -357,6 +367,8 @@ dependencies:
       services:
         - endpoint: internal
           service: oslo_db
+        - endpoint: internal
+          service: oslo_messaging
         - endpoint: internal
           service: identity
     engine_cleaner:
@@ -369,6 +381,8 @@ dependencies:
       services:
         - endpoint: internal
           service: oslo_db
+        - endpoint: internal
+          service: oslo_messaging
         - endpoint: internal
           service: identity
     ks_endpoints:
@@ -387,8 +401,8 @@ dependencies:
           service: identity
     rabbit_init:
       services:
-        - service: oslo_messaging
-          endpoint: internal
+        - endpoint: internal
+          service: oslo_messaging
     trusts:
       jobs:
         - heat-ks-user