diff --git a/templates/compose/ntfy.yaml b/templates/compose/ntfy.yaml
index 850238427..06187a368 100644
--- a/templates/compose/ntfy.yaml
+++ b/templates/compose/ntfy.yaml
@@ -12,11 +12,11 @@ services:
       - serve
     environment:
       - TZ=${TZ:-UTC}
-      - 'NTFY_BASE_URL=${SERVICE_FQDN_NTFY}'
+      - NTFY_BASE_URL=${SERVICE_FQDN_NTFY}
       - NTFY_CACHE_FILE=/var/cache/ntfy/cache.db
       - NTFY_AUTH_FILE=/var/lib/ntfy/auth.db
       - NTFY_AUTH_DEFAULT_ACCESS=read-write
-      - 'NTFY_UPSTREAM_BASE_URL=https://ntfy.sh'
+      - NTFY_UPSTREAM_BASE_URL=${UPSTREAM_BASE_URL:-https://ntfy.sh}
       - NTFY_ENABLE_SIGNUP=${NTFY_ENABLE_SIGNUP:-true} 
       - NTFY_ENABLE_LOGIN=${NTFY_ENABLE_LOGIN:-true}
       - NTFY_CACHE_DURATION=${NTFY_CACHE_DURATION:-24h}
@@ -41,9 +41,7 @@ services:
       - ./cache:/var/cache/ntfy
       - ./db:/var/lib/ntfy/
     healthcheck:
-      test:
-        - CMD-SHELL
-        - 'wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo ''"healthy"\s*:\s*true'' || exit 1'
+      test: ["CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"]
       interval: 60s
       timeout: 10s
       retries: 3