diff --git a/compose.yml b/compose.yml
index 6e37500..c9eca40 100644
--- a/compose.yml
+++ b/compose.yml
@@ -15,10 +15,8 @@ services:
       - PASSWORD_FILE=/run/secrets/admin_password
     configs:
       - source: custom_entrypoint
-        target: /usr/local/bin/docker-entrypoint.sh
+        target: /docker-entrypoint.sh
         mode: 0555
-    entrypoint: /usr/local/bin/docker-entrypoint.sh
-    command: /init
     deploy:
       restart_policy:
         condition: on-failure
@@ -28,13 +26,8 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-    healthcheck:
-      test:
-        ["CMD-SHELL", "wget -q --spider --proxy=off localhost:8787 || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 1m
+    entrypoint: /docker-entrypoint.sh
+    command: /init
 
 volumes:
   home:
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index c6a109f..4a9c257 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
 
 file_env() {
    local var="$1"
@@ -25,3 +25,5 @@ file_env() {
 }
 
 file_env "PASSWORD"
+
+exec "$@"