diff --git a/etc/topology-calico-example.yaml b/etc/topology-calico-example.yaml
index e075feac..7f94949d 100644
--- a/etc/topology-calico-example.yaml
+++ b/etc/topology-calico-example.yaml
@@ -1,3 +1,10 @@
+services:
+  database:
+    service_def: galera
+  rpc:
+    service_def: rabbitmq
+  notifications:
+    service_def: rabbitmq
 nodes:
   node1:
     roles:
@@ -13,9 +20,10 @@ nodes:
       - calico
 roles:
   db:
-    - galera
+    - database
   messaging:
-    - rabbitmq
+    - rpc
+    - notifications
   controller:
     - etcd
     - glance-api
diff --git a/etc/topology-example.yaml b/etc/topology-example.yaml
index 903ed7e8..17a8fb49 100644
--- a/etc/topology-example.yaml
+++ b/etc/topology-example.yaml
@@ -1,3 +1,10 @@
+services:
+  database:
+    service_def: galera
+  rpc:
+    service_def: rabbitmq
+  notifications:
+    service_def: rabbitmq
 nodes:
   node1:
     roles:
@@ -13,9 +20,10 @@ nodes:
       - openvswitch
 roles:
   db:
-    - galera
+    - database
   messaging:
-    - rabbitmq
+    - rpc
+    - notifications
   controller:
     - etcd
     - glance-api
diff --git a/etc/topology-opendaylight-example.yaml b/etc/topology-opendaylight-example.yaml
index 11286b75..cd3d8f01 100644
--- a/etc/topology-opendaylight-example.yaml
+++ b/etc/topology-opendaylight-example.yaml
@@ -1,3 +1,10 @@
+services:
+  database:
+    service_def: galera
+  rpc:
+    service_def: rabbitmq
+  notifications:
+    service_def: rabbitmq
 nodes:
   node1:
     roles:
@@ -14,9 +21,10 @@ nodes:
       - openvswitch
 roles:
   db:
-    - galera
+    - database
   messaging:
-    - rabbitmq
+    - rpc
+    - notifications
   controller:
     - etcd
     - glance-api
diff --git a/etc/topology-with-ceph-example.yaml b/etc/topology-with-ceph-example.yaml
index c4ce1b6d..08be5fb0 100644
--- a/etc/topology-with-ceph-example.yaml
+++ b/etc/topology-with-ceph-example.yaml
@@ -1,3 +1,10 @@
+services:
+  database:
+    service_def: galera
+  rpc:
+    service_def: rabbitmq
+  notifications:
+    service_def: rabbitmq
 nodes:
   node1:
     roles:
@@ -13,9 +20,10 @@ nodes:
       - openvswitch
 roles:
   db:
-    - galera
+    - database
   messaging:
-    - rabbitmq
+    - rpc
+    - notifications
   controller:
     - etcd
     - glance-api
diff --git a/etc/topology-with-large-number-of-nodes.yaml b/etc/topology-with-large-number-of-nodes.yaml
index 536ebec5..a0b6d384 100644
--- a/etc/topology-with-large-number-of-nodes.yaml
+++ b/etc/topology-with-large-number-of-nodes.yaml
@@ -1,3 +1,10 @@
+services:
+  database:
+    service_def: galera
+  rpc:
+    service_def: rabbitmq
+  notifications:
+    service_def: rabbitmq
 nodes:
   node[1-3]$:
     roles:
@@ -11,9 +18,10 @@ nodes:
       - openvswitch
 roles:
   db:
-    - galera
+    - database
   messaging:
-    - rabbitmq
+    - rpc
+    - notifications
   controller:
     - etcd
     - glance-api
diff --git a/etc/topology-with-stacklight-example.yaml b/etc/topology-with-stacklight-example.yaml
index 87f7f169..0e39545b 100644
--- a/etc/topology-with-stacklight-example.yaml
+++ b/etc/topology-with-stacklight-example.yaml
@@ -3,7 +3,13 @@
 # require Kubernetes 1.4 or higher. With this topology configuration and with
 # Kubernetes 1.3 the deployment will fail with an error indicating that
 # "spec.nodeName" is not supported by the downward API.
-
+services:
+  database:
+    service_def: galera
+  rpc:
+    service_def: rabbitmq
+  notifications:
+    service_def: rabbitmq
 nodes:
   node1:
     roles:
@@ -22,9 +28,10 @@ nodes:
       - openvswitch
 roles:
   db:
-    - galera
+    - database
   messaging:
-    - rabbitmq
+    - rpc
+    - notifications
   controller:
     - etcd
     - glance-api
diff --git a/tools/ccp-multi-deploy/config/ccp-configs-common.yaml b/tools/ccp-multi-deploy/config/ccp-configs-common.yaml
index 0b281ac4..cd0f3994 100644
--- a/tools/ccp-multi-deploy/config/ccp-configs-common.yaml
+++ b/tools/ccp-multi-deploy/config/ccp-configs-common.yaml
@@ -9,8 +9,8 @@ registry:
   address: "127.0.0.1:31500"
   timeout: 1500
 replicas:
-  galera: 3
-  rabbitmq: 3
+  database: 3
+  rpc: 3
 repositories:
   path: /tmp/ccp-repos
   skip_empty: True
@@ -44,5 +44,7 @@ repositories:
       name: rabbitmq
     - git_url: https://git.openstack.org/openstack/fuel-ccp-ceph
       name: ceph
+    - git_url: https://git.openstack.org/openstack/fuel-ccp-ironic
+      name: ironic
 configs:
     private_interface: ens3
diff --git a/tools/ccp-multi-deploy/config/ccp-roles.yaml b/tools/ccp-multi-deploy/config/ccp-roles.yaml
index dbda200c..c735281b 100644
--- a/tools/ccp-multi-deploy/config/ccp-roles.yaml
+++ b/tools/ccp-multi-deploy/config/ccp-roles.yaml
@@ -1,9 +1,17 @@
 ---
+services:
+  database:
+    service_def: galera
+  rpc:
+    service_def: rabbitmq
+  notifications:
+    service_def: rabbitmq
 roles:
   db:
-    - galera
+    - database
   messaging:
-    - rabbitmq
+    - rpc
+    - notifications
   controller-net-host:
     - neutron-dhcp-agent
     - neutron-l3-agent
diff --git a/tools/gate/run.sh b/tools/gate/run.sh
index aa51ad4d..1e17dc5c 100755
--- a/tools/gate/run.sh
+++ b/tools/gate/run.sh
@@ -11,6 +11,13 @@ tee "${CONFIG_FILE}" <<EOF
 debug: True
 repositories:
   path: "${WORKSPACE}"
+services:
+  database:
+    service_def: galera
+  rpc:
+    service_def: rabbitmq
+  notifications:
+    service_def: rabbitmq
 EOF
 
 tox -e venv -- python "${MY_DIR}/run_cloner.py" "${CONFIG_FILE}"  "${ZUUL_CLONER}" --cache-dir /opt/git git://git.openstack.org