diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e26f23b..1a37da2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -35,6 +35,11 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Login to GHCR
         uses: docker/login-action@v3
         with:
@@ -43,7 +48,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Prepare Chevereto
         run: mkdir -p ./chevereto
-      - name: Build
+      - name: Build and push
         uses: docker/bake-action@v4
         with:
           set: build.args.PHP=${{ matrix.php }}
@@ -58,12 +63,3 @@ jobs:
         run: |
           docker pull ${{ env.GHCR_SLUG }}:${{ steps.meta.outputs.version }}
           docker image inspect ${{ env.GHCR_SLUG }}:${{ steps.meta.outputs.version }}
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Push to Docker Hub
-        run: |
-          docker tag ${{ env.GHCR_SLUG }}:${{ steps.meta.outputs.version }} chevereto/chevereto:${{ steps.meta.outputs.version }}
-          docker push chevereto/chevereto:${{ steps.meta.outputs.version }}