diff --git a/.github/workflows/prod_CD.yml b/.github/workflows/prod_CD.yml
index 0f71f417..ed569125 100644
--- a/.github/workflows/prod_CD.yml
+++ b/.github/workflows/prod_CD.yml
@@ -83,8 +83,8 @@ jobs:
         ECR_REPOSITORY: ${{ env.ECR_REPOSITORY }}
         IMAGE_TAG: ${{ github.sha }}
       run: |
-        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
-        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+        docker buildx create --use
+        docker buildx build --platform linux/amd64,linux/arm64 --tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --push .
         echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_OUTPUT
 
     - name: Checkout Infra Repository
diff --git a/.github/workflows/stage_CD.yml b/.github/workflows/stage_CD.yml
index 529aec4a..d322991f 100644
--- a/.github/workflows/stage_CD.yml
+++ b/.github/workflows/stage_CD.yml
@@ -83,8 +83,7 @@ jobs:
         IMAGE_TAG: ${{ github.sha }}
       run: |
         docker buildx create --use
-        docker buildx build --platform linux/amd64,linux/arm64 -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
-        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+        docker buildx build --platform linux/amd64,linux/arm64 --tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --push .
         echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_OUTPUT
 
     - name: Checkout Infra Repository