diff --git a/authelia/docker-compose.yml b/authelia/docker-compose.yml
index 117e26d..8c3ee0c 100644
--- a/authelia/docker-compose.yml
+++ b/authelia/docker-compose.yml
@@ -1,10 +1,33 @@
 services:
-  authelia:
-    container_name: authelia
-    image: authelia/authelia:4.39.5
+  authelia_db:
+    container_name: authelia_db
+    image: docker.io/library/postgres:17.5
     restart: unless-stopped
+    environment:
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_DB}
+    volumes:
+      - ${APPDATA_PATH}/authelia/db:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+
+  authelia:
+    container_name: authelia
+    image: ghcr.io/authelia/authelia:4.39.5
+    restart: unless-stopped
+    depends_on:
+      authelia_db:
+        condition: service_healthy
     environment:
       - TZ=${TZ}
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - UMASK=${UMASK}
     volumes:
       - ${APPDATA_PATH}/authelia/config:/config
     ports: