diff --git a/apps/server/.env b/apps/server/.env
index ddaec921c..6a7d22525 100644
--- a/apps/server/.env
+++ b/apps/server/.env
@@ -1,7 +1,7 @@
-DATABASE_URL=""
+DATABASE_URL="postgresql://postgres:example-PAssw0rd-xHjDYR.b7N@db:5432/postgres"
 
-AUTH_GOOGLE_CLIENT_ID=""
-AUTH_GOOGLE_CLIENT_SECRET=""
+AUTH_GOOGLE_CLIENT_ID="change-me"
+AUTH_GOOGLE_CLIENT_SECRET="change-me"
 
-AUTH_GITHUB_CLIENT_ID=""
-AUTH_GITHUB_CLIENT_SECRET=""
+AUTH_GITHUB_CLIENT_ID="change-me"
+AUTH_GITHUB_CLIENT_SECRET="change-me"
diff --git a/apps/server/docker-compose.yml b/apps/server/docker-compose.yml
index 1efbfc4d4..e66167932 100644
--- a/apps/server/docker-compose.yml
+++ b/apps/server/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=example-PAssw0rd-xHjDYR.b7N
     ports:
-      - '5432:5432'
+      - '5435:5432'
     volumes:
       - ./sql/init.sql:/docker-entrypoint-initdb.d/init.sql
       - db_data:/var/lib/postgresql
@@ -25,14 +25,11 @@ services:
     depends_on:
       db:
         condition: service_healthy
-    environment:
-      # Database
-      - DATABASE_URL=postgresql://postgres:example-PAssw0rd-xHjDYR.b7N@db:5432/postgres
-      # Auth
-      - AUTH_GOOGLE_CLIENT_ID
-      - AUTH_GOOGLE_CLIENT_SECRET
-      - AUTH_GITHUB_CLIENT_ID
-      - AUTH_GITHUB_CLIENT_SECRET
+    env_file:
+      - path: .env
+        required: false
+      - path: .env.local
+        required: false
     ports:
       - '6112:3000'
     healthcheck: