diff --git a/service/files/murano.conf.j2 b/service/files/murano.conf.j2
index bfa56cc..d20fa55 100644
--- a/service/files/murano.conf.j2
+++ b/service/files/murano.conf.j2
@@ -9,10 +9,8 @@ bind_port = {{ murano.api_port.cont }}
 
 home_region = RegionOne
 
-transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address("rabbitmq", rabbitmq.port) }}/
-
 [database]
-connection = mysql+pymysql://{{ murano.db.username }}:{{ murano.db.password }}@{{ address(service.database) }}/{{ murano.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
+connection = mysql+pymysql://{{ murano.db.username }}:{{ murano.db.password }}@{{ address("database") }}/{{ murano.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
 
 [engine]
 use_trusts = True
@@ -31,11 +29,13 @@ password = {{ rabbitmq.password }}
 virtual_host = /
 
 [oslo_messaging_notifications]
-driver = messagingv2
-transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address("rabbitmq", rabbitmq.port) }}/
+driver = noop
 
 [murano]
 url = {{ address('murano-api', murano.api_port, with_scheme=True) }}
 
 [networking]
 default_dns = {{ murano.networking.dns }}
+
+{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }}
+{{ oslo_messaging[messaging.backend.notifications]('notifications_config') }}
diff --git a/service/murano-api.yaml b/service/murano-api.yaml
index ba013c3..938f693 100644
--- a/service/murano-api.yaml
+++ b/service/murano-api.yaml
@@ -14,13 +14,13 @@ service:
       pre:
         - name: murano-db-create
           type: single
-          command: mysql -v -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ murano.db.name }};
+          command: mysql -v -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ murano.db.name }};
                    create user '{{ murano.db.username }}'@'%' identified by '{{ murano.db.password }}'
                    {% if db.tls.enabled %} require ssl {% endif %};
                    grant all privileges on {{ murano.db.name }}.* to '{{ murano.db.username }}'@'%' identified by '{{ murano.db.password }}'
                    {% if db.tls.enabled %} require ssl {% endif %};"
           dependencies:
-            - {{ service.database }}
+            - database
         - name: murano-db-sync
           type: single
           command: murano-db-manage --config-file /etc/murano/murano.conf upgrade
@@ -64,6 +64,8 @@ service:
           - murano.conf
         dependencies:
           - rabbitmq
+          - rpc
+          - notifications
       post:
         - name: murano-import-core
           type: single