diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml
index cb842a6..1b6fc93 100644
--- a/.github/workflows/deploy-docker.yml
+++ b/.github/workflows/deploy-docker.yml
@@ -19,6 +19,7 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         service: [frontend, backend, discord-gateway, proxy]
     steps:
@@ -55,20 +56,8 @@ jobs:
   deploy:
     needs: build-and-push
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: SCP deploy files to VPS
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: ${{ secrets.VPS_HOST }}
-          username: ${{ secrets.VPS_USERNAME }}
-          key: ${{ secrets.VPS_SSH_KEY }}
-          source: "infra/docker/*"
-          target: "/tmp/bete-deploy"
-          strip_components: 2
-
       - name: Deploy to VPS
         uses: appleboy/ssh-action@v1.2.5
         env:
@@ -84,20 +73,25 @@ jobs:
             set -eu
 
             APP_DIR=/opt/imphenbot
-            mkdir -p "$APP_DIR" "$APP_DIR/nginx"
+            REPO_URL=https://github.com/MythEclipse/bete.git
+
+            if [ ! -d "$APP_DIR/.git" ]; then
+              mkdir -p "$APP_DIR"
+              git clone "$REPO_URL" "$APP_DIR"
+            fi
+
             cd "$APP_DIR"
+            git fetch origin master
+            git checkout master
+            git reset --hard origin/master
 
             printf '%s\n' "$ENV_FILE" > .env
 
-            # Copy deploy files from SCP staging dir
-            cp /tmp/bete-deploy/docker-compose.yml "$APP_DIR/docker-compose.yml"
-            cp /tmp/bete-deploy/nginx.conf "$APP_DIR/nginx/nginx.conf"
-
             mkdir -p recordings
 
             echo "$GHCR_TOKEN" | docker login ghcr.io -u "$GHCR_USERNAME" --password-stdin
 
-            docker compose pull
-            docker compose down --remove-orphans || true
-            docker compose up -d --remove-orphans
+            docker compose -f infra/docker/docker-compose.yml pull
+            docker compose -f infra/docker/docker-compose.yml down --remove-orphans || true
+            docker compose -f infra/docker/docker-compose.yml up -d --remove-orphans
             docker image prune -f
diff --git a/infra/docker/docker-compose.yml b/infra/docker/docker-compose.yml
index 413a107..c9ccf8f 100644
--- a/infra/docker/docker-compose.yml
+++ b/infra/docker/docker-compose.yml
@@ -3,17 +3,15 @@ version: '3.8'
 services:
   # Nginx Reverse Proxy — handles /api and /ws routing behind Traefik
   proxy:
-    build:
-      context: .
-      dockerfile: Dockerfile.nginx
-    container_name: bete-proxy
+    image: ghcr.io/${OWNER:-mytheclipse}/bete-proxy:latest
+    container_name: imphenbot-proxy
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.bete.rule=Host(`imphnen.asepharyana.my.id`)"
-      - "traefik.http.routers.bete.entrypoints=websecure"
-      - "traefik.http.routers.bete.tls=true"
-      - "traefik.http.services.bete.loadbalancer.server.port=80"
+      - "traefik.http.routers.imphenbot.rule=Host(`imphnen.asepharyana.my.id`)"
+      - "traefik.http.routers.imphenbot.entrypoints=websecure"
+      - "traefik.http.routers.imphenbot.tls=true"
+      - "traefik.http.services.imphenbot.loadbalancer.server.port=80"
     depends_on:
       - backend
       - frontend
@@ -22,17 +20,14 @@ services:
 
   # Backend Service (REST API + WebSocket)
   backend:
-    build:
-      context: ..
-      dockerfile: infra/docker/Dockerfile.backend
-    container_name: bete-backend
+    image: ghcr.io/${OWNER:-mytheclipse}/bete-backend:latest
+    container_name: imphenbot-backend
     restart: unless-stopped
     env_file:
-      - ../../.env
+      - .env
     environment:
       NODE_ENV: production
-      WEBSERVER_PORT: 3001
-    # No Traefik labels — nginx handles routing
+      WEBSERVER_PORT: 3000
     depends_on:
       - discord-gateway
     networks:
@@ -40,32 +35,23 @@ services:
 
   # Discord Gateway Service (Event capture and processing — no HTTP)
   discord-gateway:
-    build:
-      context: ..
-      dockerfile: infra/docker/Dockerfile.discord-gateway
-    container_name: bete-discord-gateway
+    image: ghcr.io/${OWNER:-mytheclipse}/bete-discord-gateway:latest
+    container_name: imphenbot-discord-gateway
     restart: unless-stopped
     env_file:
-      - ../../.env
+      - .env
     environment:
       NODE_ENV: production
     volumes:
-      - ../recordings:/app/recordings
+      - ./recordings:/app/recordings
     networks:
       - app-shared-net
 
   # Frontend Service (React Dashboard)
   frontend:
-    build:
-      context: ..
-      dockerfile: infra/docker/Dockerfile.frontend
-    container_name: bete-frontend
+    image: ghcr.io/${OWNER:-mytheclipse}/bete-frontend:latest
+    container_name: imphenbot-frontend
     restart: unless-stopped
-    environment:
-      # Point to the same domain — nginx routes /api and /ws to backend
-      VITE_BE_API_URL: https://imphnen.asepharyana.my.id
-      VITE_BE_WS_URL: wss://imphnen.asepharyana.my.id
-    # No Traefik labels — nginx handles routing
     networks:
       - app-shared-net