diff --git a/README.md b/README.md
index e5bbb58..c972d33 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,9 @@
 <!-- metadata -->
 
 * **Category**: Apps
-* **Status**: 0
+* **Status**: 2
 * **Image**: [`mobilizon`](https://hub.docker.com/r/framasoft/mobilizon), 4, upstream
-* **Healthcheck**: No
+* **Healthcheck**: Yes
 * **Backups**: No
 * **Email**: Yes
 * **Tests**: No
diff --git a/compose.yml b/compose.yml
index a205476..fa0f634 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,9 +34,7 @@ services:
       - db_password
     volumes:
       - "uploads:/var/lib/mobilizon/uploads"
-      # - ${PWD}/config.exs:/etc/mobilizon/config.exs:ro
     entrypoint: /custom-entrypoint.sh
-    # entrypoint: ["/bin/sh", "-c", "sleep 10000000000000000"]
     configs:
       - source: app_entrypoint
         target: /custom-entrypoint.sh
@@ -53,17 +51,12 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=0.1.1+4.1.0"
-        ## Redirect from EXTRA_DOMAINS to DOMAIN
-        #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-    # healthcheck:
-    #   test: ["CMD", "curl", "-f", "http://localhost"]
-    #   interval: 30s
-    #   timeout: 10s
-    #   retries: 10
-    #   start_period: 1m
+        - "coop-cloud.${STACK_NAME}.version=0.2.1+5.1.2"
+    healthcheck:
+      test: ["CMD", "curl", "-s", "http://localhost:4000"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
 
   db:
     deploy:
@@ -82,6 +75,11 @@ services:
       POSTGRES_DB: mobilizon
       POSTGRES_USER: mobilizon
       POSTGRES_PASSWORD_FILE: /run/secrets/db_password
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
 volumes:
   uploads: