diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
index 663ba77..3c4ae4f 100644
--- a/.github/workflows/deploy-prod.yml
+++ b/.github/workflows/deploy-prod.yml
@@ -36,6 +36,15 @@ jobs:
         id: get_version
         run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
 
+      - name: JDK 21 설정
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'corretto'
+
+      - name: JAR 빌드
+        run: ./gradlew bootJar --no-daemon
+
       - name: Docker Hub 로그인
         run: echo "${{ secrets.DOCKER_ACCESS_TOKEN }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
diff --git a/Dockerfile b/Dockerfile
index ea2cc0d..0f38e7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,3 @@
-# Build stage
-FROM amazoncorretto:21-alpine3.19-jdk AS builder
-
-WORKDIR /app
-
-COPY gradlew .
-COPY gradle gradle
-COPY build.gradle .
-COPY settings.gradle .
-COPY src src
-
-RUN chmod +x ./gradlew
-RUN ./gradlew bootJar --no-daemon
-
-# Runtime stage
 FROM amazoncorretto:21-alpine3.19
 
 WORKDIR /app
@@ -25,7 +10,7 @@ RUN apk add --no-cache curl tzdata && \
 RUN addgroup -g 1001 appgroup && adduser -u 1001 -G appgroup -D appuser
 RUN mkdir -p /app/log && chown -R appuser:appgroup /app
 
-COPY --from=builder --chown=appuser:appgroup /app/build/libs/*.jar app.jar
+COPY --chown=appuser:appgroup build/libs/*.jar app.jar
 
 USER appuser