diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml
index 6a0f7a6471..01425f5f49 100644
--- a/playbooks/inventory/group_vars/all.yml
+++ b/playbooks/inventory/group_vars/all.yml
@@ -122,6 +122,7 @@ cinder_ceph_client: cinder
 cinder_rabbitmq_userid: cinder
 cinder_rabbitmq_vhost: /cinder
 cinder_rabbitmq_host_group: "rabbitmq_all"
+cinder_rabbitmq_port: "{{ rabbitmq_port }}"
 
 ## Glance
 glance_service_port: 9292
@@ -140,11 +141,13 @@ glance_service_user_name: glance
 glance_rabbitmq_userid: glance
 glance_rabbitmq_vhost: /glance
 glance_rabbitmq_host_group: "rabbitmq_all"
+glance_rabbitmq_port: "{{ rabbitmq_port }}"
 
 ## Heat
 heat_rabbitmq_userid: heat
 heat_rabbitmq_vhost: /heat
 heat_rabbitmq_host_group: "rabbitmq_all"
+heat_rabbitmq_port: "{{ rabbitmq_port }}"
 
 ## Keystone
 keystone_admin_user_name: admin
@@ -156,6 +159,7 @@ keystone_service_region: "{{ service_region }}"
 keystone_rabbitmq_userid: keystone
 keystone_rabbitmq_vhost: /keystone
 keystone_rabbitmq_host_group: "rabbitmq_all"
+keystone_rabbitmq_port: "{{ rabbitmq_port }}"
 
 keystone_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(keystone_service_proto) }}"
 keystone_service_adminuri_insecure: "{% if keystone_service_adminuri_proto == 'https' and (keystone_user_ssl_cert is not defined or haproxy_user_ssl_cert is not defined) | bool %}true{% else %}false{% endif %}"
@@ -179,6 +183,7 @@ neutron_service_region: "{{ service_region }}"
 neutron_rabbitmq_userid: neutron
 neutron_rabbitmq_vhost: /neutron
 neutron_rabbitmq_host_group: "rabbitmq_all"
+neutron_rabbitmq_port: "{{ rabbitmq_port }}"
 neutron_plugin_type: ml2.lxb
 
 ## Nova
@@ -196,6 +201,7 @@ nova_service_user_domain_id: default
 nova_rabbitmq_userid: nova
 nova_rabbitmq_vhost: /nova
 nova_rabbitmq_host_group: "rabbitmq_all"
+nova_rabbitmq_port: "{{ rabbitmq_port }}"
 nova_keystone_auth_plugin: password
 nova_console_type: spice
 nova_novncproxy_port: 6080
diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
index 8eaa7ca354..338142a8ff 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@@ -25,12 +25,6 @@
     - create-directories
 
 
-# NOTICE(cloudnull) The ceilometer and aodh inclusion for the gate has been removed.
-# We need to add these lines back as soon as the gate stabalizes.
-# -    - name: aodh.yml.aio
-# -      override: "{{ aodh_conf_overrides | default({}) }}"
-# -    - name: ceilometer.yml.aio
-# -      override: "{{ ceilometer_conf_overrides | default({}) }}"
 - name: Deploy user conf.d configuration
   config_template:
     src: "../etc/openstack_deploy/conf.d/{{ item.name }}"
@@ -40,6 +34,10 @@
   with_items:
     - name: swift.yml.aio
       override: "{{ swift_conf_overrides | default({}) }}"
+    - name: aodh.yml.aio
+      override: "{{ aodh_conf_overrides | default({}) }}"
+    - name: ceilometer.yml.aio
+      override: "{{ ceilometer_conf_overrides | default({}) }}"
   tags:
     - deploy-confd