diff --git a/.gitea/workflows/cicd.yml b/.gitea/workflows/cicd.yml
index d81007c..8eef019 100644
--- a/.gitea/workflows/cicd.yml
+++ b/.gitea/workflows/cicd.yml
@@ -21,17 +21,33 @@ jobs:
           git fetch --no-tags --prune --depth=1 origin "${SHA}"
           git checkout -q FETCH_HEAD
 
+      - name: Ensure docker compose available
+        run: |
+          set -euo pipefail
+          docker version
+          if ! docker compose version >/dev/null 2>&1; then
+            # docker:24-git(Alpine) 기준
+            apk add --no-cache docker-cli-compose
+          fi
+          docker compose version
+
       - name: Docker login
+        env:
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         run: |
-          echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Build
+          set -euo pipefail
+          echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USER}" --password-stdin
+      
+      - name: Build & push image
+        env:
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          IMAGE_NAME: baekjoon-bot
         run: |
-          docker build -t nkey01/baekjoon-bot:latest .
-
-      - name: Push
-        run: |
-          docker push nkey01/baekjoon-bot:latest
+          set -euo pipefail
+          IMAGE="${DOCKERHUB_USER}/${IMAGE_NAME}:latest"
+          docker build -t "${IMAGE}" .
+          docker push "${IMAGE}"
 
       - name: Deploy on server (compose pull/up)
         run: |