diff --git a/playbooks/setup-openstack.yml b/playbooks/setup-openstack.yml
index 5fe164cd42..d25bd47607 100644
--- a/playbooks/setup-openstack.yml
+++ b/playbooks/setup-openstack.yml
@@ -21,8 +21,6 @@
 - include: os-neutron-install.yml
 - include: os-heat-install.yml
 - include: os-horizon-install.yml
-- include: os-ceilometer-install.yml
-- include: os-aodh-install.yml
 - include: os-designate-install.yml
 #NOTE(stevelle) Ensure Gnocchi identities exist before Swift
 - include: os-gnocchi-install.yml
@@ -33,6 +31,8 @@
     gnocchi_identity_only: True
 - include: os-swift-install.yml
 - include: os-gnocchi-install.yml
+- include: os-ceilometer-install.yml
+- include: os-aodh-install.yml
 - include: os-ironic-install.yml
 - include: os-magnum-install.yml
 - include: os-trove-install.yml