diff --git a/.env.example b/.env.example
index 13a6e47..6502581 100644
--- a/.env.example
+++ b/.env.example
@@ -1,14 +1,13 @@
-# Database Configuration
-POSTGRES_USER=ackifyr
-POSTGRES_PASSWORD=your_secure_password
-POSTGRES_DB=ackify
-
 # Application Configuration
 APP_NAME=ackify
 APP_DNS=sign.your-domain.com
 ACKIFY_BASE_URL=https://sign.your-domain.com
 ACKIFY_ORGANISATION="Your Organization Name"
-ACKIFY_DB_DSN="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@ackify-db:5432/${POSTGRES_DB}?sslmode=disable"
+
+# Database Configuration
+POSTGRES_USER=ackifyr
+POSTGRES_PASSWORD=your_secure_password
+POSTGRES_DB=ackify
 
 # OAuth2 Configuration - Generic Provider
 ACKIFY_OAUTH_CLIENT_ID=your_oauth_client_id
diff --git a/docker-compose.yml b/docker-compose.yml
index 2acfac0..dff8ae0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,10 +7,10 @@ services:
     environment:
       ACKIFY_BASE_URL: "${ACKIFY_BASE_URL}"
       ACKIFY_ORGANISATION: "${ACKIFY_ORGANISATION}"
+      ACKIFY_DB_DSN: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@ackify-db:5432/${POSTGRES_DB}?sslmode=disable"
       ACKIFY_OAUTH_PROVIDER: "${ACKIFY_OAUTH_PROVIDER}"
       ACKIFY_OAUTH_CLIENT_ID: "${ACKIFY_OAUTH_CLIENT_ID}"
       ACKIFY_OAUTH_CLIENT_SECRET: "${ACKIFY_OAUTH_CLIENT_SECRET}"
-      ACKIFY_DB_DSN: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@ackify-db:5432/${POSTGRES_DB}?sslmode=disable"
     depends_on:
       ackify-db:
         condition: service_healthy
@@ -27,7 +27,7 @@ services:
     environment:
       ACKIFY_BASE_URL: "https://${APP_DNS}"
       ACKIFY_ORGANISATION: "${ACKIFY_ORGANISATION}"
-      ACKIFY_DB_DSN: "${ACKIFY_DB_DSN}"
+      ACKIFY_DB_DSN: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@ackify-db:5432/${POSTGRES_DB}?sslmode=disable"
       ACKIFY_OAUTH_PROVIDER: "${ACKIFY_OAUTH_PROVIDER}"
       ACKIFY_OAUTH_CLIENT_ID: "${ACKIFY_OAUTH_CLIENT_ID}"
       ACKIFY_OAUTH_CLIENT_SECRET: "${ACKIFY_OAUTH_CLIENT_SECRET}"