diff --git a/roles/docker/tasks/productivity/gokapi.yml b/roles/docker/tasks/productivity/gokapi.yml
index f93ef31..60008af 100644
--- a/roles/docker/tasks/productivity/gokapi.yml
+++ b/roles/docker/tasks/productivity/gokapi.yml
@@ -47,10 +47,12 @@
       no_log: true
 
     - name: Wait for the one-off gokapi to finish starting
-      ansible.builtin.wait_for:
-        path: /opt/stacks/gokapi/data/log.txt
-        search_regex: Gokapi started
-        timeout: 60
+      ansible.builtin.command: docker inspect -f '{{ "{{" }}.State.Health.Status{{ "}}" }}' gokapi-init
+      register: gokapi_init_health
+      until: gokapi_init_health.stdout == "healthy"
+      retries: 30
+      delay: 3
+      changed_when: false
   always:
     - name: Stop the one-off gokapi
       ansible.builtin.command: docker rm -f gokapi-init