diff --git a/apps/gramps/docker-compose.yml b/apps/gramps/docker-compose.yml
index e2caefd..216a023 100644
--- a/apps/gramps/docker-compose.yml
+++ b/apps/gramps/docker-compose.yml
@@ -7,8 +7,8 @@ services:
       - gramps-redis
       - grampsweb_celery
     restart: always
-#    env_file:
-#      - ${SECRETS_ENV_FILE}
+    env_file:
+      - ${SECRETS_ENV_FILE}
     environment:
       TZ: ${TZ}
       GRAMPSWEB_TREE: ${GRAMPSWEB_TREE}
@@ -62,8 +62,8 @@ services:
     depends_on:
       - gramps-redis
     restart: always
-    env_file:
-      - ${SECRETS_ENV_FILE}
+#    env_file:
+#      - ${SECRETS_ENV_FILE}
     environment:
       TZ: ${TZ}
       GRAMPSWEB_TREE: ${GRAMPSWEB_TREE}
@@ -91,6 +91,14 @@ services:
       - ${PROJECT_ROOT}/apps/gramps/data/tmp:/tmp
     networks:
       - gramps
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - pgrep -f "celery.*gramps_webapi.celery.*worker" >/dev/null
+      interval: 30s
+      timeout: 5s
+      retries: 6
+      start_period: 60s
 
   gramps-redis:
     profiles: ["apps","all","gramps"]
@@ -99,6 +107,14 @@ services:
     restart: always
     networks:
       - gramps
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - valkey-cli -h 127.0.0.1 -p 6379 ping | grep -q PONG
+      interval: 10s
+      timeout: 5s
+      retries: 6
+      start_period: 10s
 
 networks:
   gramps: