diff --git a/README.rst b/README.rst
index 3fdf42355f..1e1f655db1 100644
--- a/README.rst
+++ b/README.rst
@@ -89,7 +89,9 @@ and should be executed according to the following table:
 +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
 | neutron-l2gw   |        |        |        |        |   wip  |        |        |        |        |        |
 +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
-| rabbitmq       |        |    X   |    X   |    X   |    X   |    X   |    X   |        |    X   |    X   |
+| om-rpc         |        | rabbit | rabbit |  amqp1 | rabbit | rabbit | rabbit |        | rabbit | rabbit |
++----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+| om-notify      |        | rabbit | rabbit | rabbit | rabbit | rabbit | rabbit |        | rabbit | rabbit |
 +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
 | mongodb        |        |        |        |        |        |        |        |        |        |        |
 +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml
index 17426e32ac..5a97c75fa9 100644
--- a/ci/environments/scenario003-multinode-containers.yaml
+++ b/ci/environments/scenario003-multinode-containers.yaml
@@ -7,8 +7,8 @@ resource_registry:
   OS::TripleO::Services::MistralEngine: ../../docker/services/mistral-engine.yaml
   OS::TripleO::Services::MistralExecutor: ../../docker/services/mistral-executor.yaml
   OS::TripleO::Services::MistralEventEngine: ../../docker/services/mistral-event-engine.yaml
-  OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
-  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
+  OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml
+  OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/pacemaker/notify-rabbitmq.yaml
   OS::TripleO::Services::HAproxy: ../../docker/services/pacemaker/haproxy.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
@@ -86,3 +86,5 @@ parameter_defaults:
   SwiftCeilometerPipelineEnabled: false
   NotificationDriver: 'noop'
   NeutronPluginExtensions: qos,port_security,dns
+  RpcPort: 31459
+  NotifyPort: 5672