diff --git a/deployment/puppet/openstack_tasks/examples/glance/tasks.yaml b/deployment/puppet/openstack_tasks/examples/glance/tasks.yaml
index 9e00b3f0a2..668f7d8ddf 100644
--- a/deployment/puppet/openstack_tasks/examples/glance/tasks.yaml
+++ b/deployment/puppet/openstack_tasks/examples/glance/tasks.yaml
@@ -7,6 +7,7 @@
   cross-depends:
     - name: glance-db
     - name: glance-keystone
+    - name: /(primary-)?rabbitmq/
   parameters:
     puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/glance/glance.pp
     puppet_modules: /etc/puppet/modules
diff --git a/deployment/puppet/openstack_tasks/examples/openstack-network/tasks.yaml b/deployment/puppet/openstack_tasks/examples/openstack-network/tasks.yaml
index 9cac58a637..7e1e9e0c65 100644
--- a/deployment/puppet/openstack_tasks/examples/openstack-network/tasks.yaml
+++ b/deployment/puppet/openstack_tasks/examples/openstack-network/tasks.yaml
@@ -35,6 +35,7 @@
     - name: neutron-keystone
     - name: openstack-haproxy
     - name: neutron-db
+    - name: (primary-)?rabbitmq
 
 - id: openstack-network-common-config
   type: puppet
diff --git a/deployment/puppet/osnailyfacter/modular/apache/tasks.yaml b/deployment/puppet/osnailyfacter/modular/apache/tasks.yaml
index 4879e2929f..95ba329024 100644
--- a/deployment/puppet/osnailyfacter/modular/apache/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/apache/tasks.yaml
@@ -3,7 +3,7 @@
   version: 2.0.0
   groups: [primary-controller, controller]
   required_for: [keystone, primary-keystone]
-  requires: [openstack-haproxy]
+  requires: [netconfig]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/apache/apache.pp
     puppet_modules: /etc/puppet/modules
diff --git a/deployment/puppet/osnailyfacter/modular/memcached/tasks.yaml b/deployment/puppet/osnailyfacter/modular/memcached/tasks.yaml
index 3e0f8dc292..ef65895766 100644
--- a/deployment/puppet/osnailyfacter/modular/memcached/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/memcached/tasks.yaml
@@ -3,7 +3,7 @@
   version: 2.0.0
   groups: [primary-controller, controller]
   required_for: [deploy_end, keystone, primary-keystone]
-  requires: [openstack-haproxy]
+  requires: [netconfig]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/memcached/memcached.pp
     puppet_modules: /etc/puppet/modules
diff --git a/deployment/puppet/osnailyfacter/modular/rabbitmq/tasks.yaml b/deployment/puppet/osnailyfacter/modular/rabbitmq/tasks.yaml
index 86b14e6b8c..b2e0176154 100644
--- a/deployment/puppet/osnailyfacter/modular/rabbitmq/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/rabbitmq/tasks.yaml
@@ -5,7 +5,7 @@
   cross-depends:
     - name: primary-rabbitmq
   required_for: [deploy_end, openstack-controller, primary-openstack-controller, glance]
-  requires: [openstack-haproxy]
+  requires: [netconfig, cluster]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq.pp
     puppet_modules: /etc/puppet/modules
@@ -17,7 +17,7 @@
   version: 2.0.0
   groups: [primary-controller]
   required_for: [deploy_end, openstack-controller, primary-openstack-controller, glance]
-  requires: [openstack-haproxy]
+  requires: [netconfig, primary-cluster]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq.pp
     puppet_modules: /etc/puppet/modules