diff --git a/roles/svc-prx-openresty/handlers/main.yml b/roles/svc-prx-openresty/handlers/main.yml
index 05410ccc..29da8c09 100644
--- a/roles/svc-prx-openresty/handlers/main.yml
+++ b/roles/svc-prx-openresty/handlers/main.yml
@@ -1,4 +1,13 @@
 ---
+- name: Wait until OpenResty container is running
+  command: docker inspect -f '{{.State.Running}}' {{ OPENRESTY_CONTAINER }}
+  register: openresty_status
+  retries: 10
+  delay: 3
+  until: openresty_status.stdout.strip() == "true"
+  changed_when: false
+  listen: restart openresty
+
 - name: Validate OpenResty configuration
   command: >
     docker exec {{ OPENRESTY_CONTAINER }} openresty -t -q