diff --git a/.github/workflows/auto-assign-merge.yml b/.github/workflows/auto-assign-merge.yml
index 6f72afed..d6591f7c 100644
--- a/.github/workflows/auto-assign-merge.yml
+++ b/.github/workflows/auto-assign-merge.yml
@@ -68,9 +68,9 @@ jobs:
                           ? context.payload.pull_request.requested_reviewers.map(r => r.login)
                           : [];
 
-                      const BE_reviewers = ['summersummerwhy', 'ezcolin2', 'Tolerblanc'];
-                      const FE_reviewers = ['yewonJin', 'djk01281'];
-                      const doc_reviewers = ['summersummerwhy', 'ezcolin2', 'Tolerblanc', 'yewonJin', 'djk01281'];
+                      const BE_reviewers = ['summersummerwhy', 'ezcolin2'];
+                      const FE_reviewers = ['baegyeong', 'pkh0106'];
+                      const doc_reviewers = ['summersummerwhy', 'ezcolin2', 'baegyeong', 'pkh0106'];
 
                       // Function to filter out assignees, PR author, and current reviewers
                       const filterReviewers = (reviewers) => {
diff --git a/apps/backend/src/auth/auth.controller.spec.ts b/apps/backend/src/auth/auth.controller.spec.ts
index 4f90b096..159df8fe 100644
--- a/apps/backend/src/auth/auth.controller.spec.ts
+++ b/apps/backend/src/auth/auth.controller.spec.ts
@@ -29,6 +29,10 @@ describe('AuthController', () => {
             refreshAccessToken: jest.fn(() => 'mockedAccessToken'),
           },
         },
+        {
+          provide: JwtAuthGuard,
+          useValue: {},
+        },
       ],
     })
       .overrideGuard(JwtAuthGuard)
diff --git a/compose.local.yml b/compose.local.yml
index c95cfcbb..29b2a355 100644
--- a/compose.local.yml
+++ b/compose.local.yml
@@ -3,16 +3,14 @@ version: "3.8"
 services:
   postgres:
     image: postgres:16-alpine
-    environment:
-      POSTGRES_USER: ${DB_USER}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_DB: ${DB_NAME}
+    env_file:
+      - .env.local
     volumes:
       - postgres_data:/var/lib/postgresql/data
     networks:
       - net
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -21,9 +19,8 @@ services:
 
   redis:
     image: redis:latest
-    environment:
-      REDIS_HOST: ${REDIS_HOST}
-      REDIS_PORT: ${REDIS_PORT}
+    env_file:
+      - .env.local
     networks:
       - net
     ports:
@@ -40,9 +37,8 @@ services:
       dockerfile: ./services/frontend/Dockerfile.local
     image: frontend:latest
     env_file:
-      - .env
+      - .env.local
     volumes:
-      - .env:/app/.env
       - ./apps/frontend:/app/apps/frontend
 
     networks:
@@ -56,9 +52,8 @@ services:
       dockerfile: ./services/backend/Dockerfile.local
     image: backend:latest
     env_file:
-      - .env
+      - .env.local
     volumes:
-      - .env:/app/.env
       - ./apps/backend:/app/apps/backend
     depends_on:
       postgres:
@@ -76,9 +71,8 @@ services:
       dockerfile: ./services/websocket/Dockerfile.local
     image: websocket:latest
     env_file:
-      - .env
+      - .env.local
     volumes:
-      - .env:/app/.env
       - ./apps/websocket:/app/apps/websocket
     depends_on:
       postgres:
diff --git a/compose.prod.yml b/compose.prod.yml
index 33cc3f61..1bd8ca41 100644
--- a/compose.prod.yml
+++ b/compose.prod.yml
@@ -3,6 +3,8 @@ version: "3.8"
 services:
   nginx:
     image: summersummerwhy/octodocs-nginx:latest
+    env_file:
+      - .env.server
     restart: always
     ports:
       - "80:80"
@@ -20,8 +22,8 @@ services:
 
   backend:
     image: summersummerwhy/octodocs-backend:latest
-    volumes:
-      - ./.env.server:/app/apps/backend/.env
+    env_file:
+      - .env.server
     expose:
       - "3000"
     networks:
@@ -48,8 +50,8 @@ services:
 
   websocket:
     image: summersummerwhy/octodocs-websocket:latest
-    volumes:
-      - ./.env.server:/app/apps/websocket/.env
+    env_file:
+      - .env.server
     expose:
       - "4242"
     networks:
@@ -78,9 +80,8 @@ services:
 
   redis:
     image: redis:latest
-    environment:
-      REDIS_HOST: ${REDIS_HOST}
-      REDIS_PORT: ${REDIS_PORT}
+    env_file:
+      - .env.server
     networks:
       - backend
       - frontend