diff --git a/service/files/nova.conf.j2 b/service/files/nova.conf.j2
index 3f0467c..272be2f 100644
--- a/service/files/nova.conf.j2
+++ b/service/files/nova.conf.j2
@@ -10,8 +10,6 @@ osapi_compute_listen_port = {{ nova.api_port.cont }}
 metadata_listen = {{ network_topology["private"]["address"] }}
 metadata_listen_port = {{ nova.metadata.port.cont }}
 
-transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq') }}
-
 use_neutron = true
 firewall_driver = nova.virt.firewall.NoopFirewallDriver
 scheduler_max_attempts = 10
@@ -74,17 +72,6 @@ admin_tenant_name = service
 api_endpoint = http://{{ address('ironic-api') }}:{{ ironic_api_port }}/v1
 {% endif %}
 
-[oslo_messaging_notifications]
-{% if searchlight is defined and searchlight.services.nova %}
-driver = {{ searchlight.notification_driver }}
-notify_on_state_change = vm_and_task_state
-{% else %}
-driver = noop
-{% endif %}
-
-[oslo_messaging_rabbit]
-rabbit_ha_queues = false
-
 [oslo_concurrency]
 lock_path = /var/lib/nova/tmp
 
@@ -175,3 +162,13 @@ compute = auto
 
 [wsgi]
 api_paste_config = /etc/nova/api-paste.ini
+
+[oslo_messaging_notifications]
+{% if searchlight is defined and searchlight.services.nova %}
+driver = {{ searchlight.notification_driver }}
+notify_on_state_change = vm_and_task_state
+{% endif %}
+
+{# messaging macros templates #}
+{{ oslo_messaging[messaging.backend.notifications]('notifications_config') }}
+{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }}
diff --git a/service/nova-compute.yaml b/service/nova-compute.yaml
index 80c6b56..7a82221 100644
--- a/service/nova-compute.yaml
+++ b/service/nova-compute.yaml
@@ -33,6 +33,8 @@ service:
           - nova-db-migrations
           - nova-libvirt:local
           - nova-conductor
+          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
+          - "{{ messaging.dependencies[messaging.backend.notifications] }}"
         files:
           - nova.conf
           # {% if nova.libvirt.tls_enable %}
diff --git a/service/nova-conductor.yaml b/service/nova-conductor.yaml
index d25a80b..ea1e981 100644
--- a/service/nova-conductor.yaml
+++ b/service/nova-conductor.yaml
@@ -10,6 +10,8 @@ service:
           - nova.conf
         dependencies:
           - nova-db-migrations
+          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
+          - "{{ messaging.dependencies[messaging.backend.notifications] }}"
 files:
   nova.conf:
     path: /etc/nova/nova.conf
diff --git a/service/nova-scheduler.yaml b/service/nova-scheduler.yaml
index a63a1d9..6b07f43 100644
--- a/service/nova-scheduler.yaml
+++ b/service/nova-scheduler.yaml
@@ -10,6 +10,8 @@ service:
           - nova.conf
         dependencies:
           - nova-db-migrations
+          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
+          - "{{ messaging.dependencies[messaging.backend.notifications] }}"
 files:
   nova.conf:
     path: /etc/nova/nova.conf