diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4dfcda903..42cf73762 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,9 +4,8 @@ on:
   push:
     branches:
       - 3.x
-  # Build and push Docker images *only* for releases.
   release:
-    types: [published] # , created, edited
+    types: [published]
 
 jobs:
   push_to_registry:
@@ -14,33 +13,27 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - name: Check out the repo with latest code
+      - name: Check out the repo with the latest code
         uses: actions/checkout@v4
-      - name: Push latest to Docker Hub
-        uses: docker/build-push-action@v6 # Info: https://github.com/docker/build-push-action/tree/releases/v1#tags
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          repository: ${{ secrets.DOCKERHUB_REPOSITORY }}
-          tag_with_ref: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_ref
-          tag_with_sha: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_sha
-          tags: latest
 
-      - name: 'Get the current tag'
+      - name: Get the current tag
         id: currentTag
-        uses: actions/checkout@v4
-      - run: git fetch --prune --unshallow && TAG=$(git describe --tags --abbrev=0) && echo $TAG && echo "TAG="$TAG >> "$GITHUB_ENV"
-      - name: Check out the repo with tag
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.TAG }}
+        run: echo "TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
 
-      - name: Push current tag to Docker Hub
-        uses: docker/build-push-action@v6 # Info: https://github.com/docker/build-push-action/tree/releases/v1#tags
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          repository: ${{ secrets.DOCKERHUB_REPOSITORY }}
-          tag_with_ref: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_ref
-          tag_with_sha: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_sha
-          tags: ${{ env.TAG }}
+          context: .
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_REPOSITORY }}:latest
+            ${{ secrets.DOCKERHUB_REPOSITORY }}:${{ env.TAG }}
\ No newline at end of file