diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index e30f6a4cf..50a1a1a4d 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -38,16 +38,21 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - name: Build and push Docker image
+        uses: docker/build-push-action@v5
         env:
           DOCKER_NAMESPACE: ${{ secrets.DOCKER_NAMESPACE }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           VERSION: ${{ steps.version.outputs.version }}
-        run: |
-          docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-          cd snail-job-server/snail-job-server-starter/ \
-            && docker buildx build --platform linux/amd64,linux/arm64 \
-            -t ${DOCKER_NAMESPACE}/snail-job:latest \
-            -t ${DOCKER_NAMESPACE}/snail-job:${VERSION} \
-            --push .
+        with:
+          context: snail-job-server/snail-job-server-starter/
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ env.DOCKER_NAMESPACE }}/snail-job:latest
+            ${{ env.DOCKER_NAMESPACE }}/snail-job:${{ env.VERSION }}
\ No newline at end of file