diff --git a/tasks/gnocchi_policy_setup.yml b/tasks/gnocchi_policy_setup.yml
index 9c2e202..fa016ee 100644
--- a/tasks/gnocchi_policy_setup.yml
+++ b/tasks/gnocchi_policy_setup.yml
@@ -19,8 +19,12 @@
     - gnocchi-setup
     - gnocchi-policy-setup
 
-- name: Wait for Gnocchi API service to be available
-  pause: seconds=10
+- name: Wait for keystone admin to come up
+  wait_for:
+    host: "{{ internal_lb_vip_address }}"
+    port: "{{ gnocchi_service_port }}"
+    timeout: 25
+    delay: 10
   run_once: true
   tags:
     - gnocchi-setup