diff --git a/roles/services/tasks/main.yml b/roles/services/tasks/main.yml
index 49df3e0..38b3b1d 100644
--- a/roles/services/tasks/main.yml
+++ b/roles/services/tasks/main.yml
@@ -141,10 +141,11 @@
     label: "{{ item.item }}"
 
 # ── Docmost: wait for healthy ────────────────────────────────────────────────
-- name: Wait for Docmost to be healthy
-  ansible.builtin.command: docker exec docmost wget -qO- http://127.0.0.1:3000/api/health
+- name: Wait for Docmost container to be healthy
+  ansible.builtin.command: >
+    docker inspect --format='{{ '{{' }}.State.Health.Status{{ '}}' }}' docmost
   register: docmost_health
   changed_when: false
   retries: 30
   delay: 10
-  until: docmost_health.rc == 0
+  until: docmost_health.stdout == 'healthy'
diff --git a/roles/services/templates/docker-compose.yml.j2 b/roles/services/templates/docker-compose.yml.j2
index 5580ee0..1853101 100644
--- a/roles/services/templates/docker-compose.yml.j2
+++ b/roles/services/templates/docker-compose.yml.j2
@@ -513,11 +513,11 @@ services:
       docmost-redis:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://127.0.0.1:3000/api/health"]
+      test: ["CMD", "curl", "-sf", "http://127.0.0.1:3000/api/health"]
       interval: 30s
-      timeout: 5s
-      retries: 5
-      start_period: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 60s
     logging:
       driver: json-file
       options: