diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index b9f76866..4392b93c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -46,11 +46,9 @@ services:
       - ./setup.sql:/docker-entrypoint-initdb.d/setup.sql
     environment:
       - MYSQL_ROOT_PASSWORD=${AA_DB_ROOT_PASSWORD?err}
+      - MARIADB_MYSQL_LOCALHOST_USER=1
     healthcheck:
-      test: ["CMD", "mysqladmin", "-uroot", "-proot", "-h", "localhost", "ping"]
-      interval: 5s
-      timeout: 10s
-      retries: 3
+      test: ["CMD", "healthcheck.sh",  "--su=mysql", "--connect", "--innodb_initialized"]
     restart: unless-stopped
 
   nginx:
@@ -68,6 +66,9 @@ services:
     restart: always
     volumes:
       - "redis-data:/data"
+      - ./conf/redis_healthcheck.sh:/redis_healthcheck.sh
+    healthcheck:
+      test: ["CMD", "redis_healthcheck.sh"]
 
   allianceauth_gunicorn:
     ports:
@@ -124,21 +125,17 @@ services:
       GF_AUTH_DATABASE_PASSWORD: ${GRAFANA_DB_PASSWORD}
 
   proxy:
-    image: 'jc21/nginx-proxy-manager:latest'
+    image: jc21/nginx-proxy-manager:latest
     restart: always
     ports:
-      - '${PROXY_HTTP_PORT:-80}:80'
-      - '${PROXY_DASH_PORT:-81}:81'
-      - '${PROXY_HTTPS_PORT:-443}:443'
-    environment:
-      DB_MYSQL_HOST: "proxy-db"
-      DB_MYSQL_PORT: 3306
-      DB_MYSQL_USER: "npm"
-      DB_MYSQL_PASSWORD: "${PROXY_MYSQL_PASS?err}"
-      DB_MYSQL_NAME: "npm"
+      - ${PROXY_HTTP_PORT:-80}:80
+      - ${PROXY_DASH_PORT:-81}:81
+      - ${PROXY_HTTPS_PORT:-443}:443
     volumes:
       - proxy-data:/data
       - proxy-le:/etc/letsencrypt
+    healthcheck:
+      test: ["CMD", "/bin/check-health"]
 
   proxy-db:
     image: 'jc21/mariadb-aria:latest'