diff --git a/.github/workflows/task-build-and-publish-release.yml b/.github/workflows/task-build-and-publish-release.yml
index 3318c35005..213302f8b3 100644
--- a/.github/workflows/task-build-and-publish-release.yml
+++ b/.github/workflows/task-build-and-publish-release.yml
@@ -103,9 +103,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: useblacksmith/setup-docker-builder@v1
+
       - name: Build Docker Image and Publish
         id: push
-        uses: docker/build-push-action@v6
+        uses: useblacksmith/build-push-action@v2
         with:
           context: .
           push: true
diff --git a/.github/workflows/task-build-artifacts.yml b/.github/workflows/task-build-artifacts.yml
index fa58d0093c..f273301808 100644
--- a/.github/workflows/task-build-artifacts.yml
+++ b/.github/workflows/task-build-artifacts.yml
@@ -76,7 +76,7 @@ jobs:
           echo "artifacts-pr=$ARTIFACTS_PR" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: useblacksmith/setup-docker-builder@v1
 
       - name: Build Docker image
         id: push
diff --git a/.github/workflows/task-build-manual-and-publish.yml b/.github/workflows/task-build-manual-and-publish.yml
index 0f42c8b5ec..094f3b32c7 100644
--- a/.github/workflows/task-build-manual-and-publish.yml
+++ b/.github/workflows/task-build-manual-and-publish.yml
@@ -78,9 +78,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: useblacksmith/setup-docker-builder@v1
+
       - name: Build Docker Image and Publish
         id: push
-        uses: docker/build-push-action@v6
+        uses: useblacksmith/build-push-action@v2
         with:
           context: .
           push: true
diff --git a/.github/workflows/task-build-nightly-and-publish.yml b/.github/workflows/task-build-nightly-and-publish.yml
index 44dd0ebb83..263f349c5d 100644
--- a/.github/workflows/task-build-nightly-and-publish.yml
+++ b/.github/workflows/task-build-nightly-and-publish.yml
@@ -84,9 +84,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: useblacksmith/setup-docker-builder@v1
+
       - name: Build Docker Image and Publish
         id: push
-        uses: docker/build-push-action@v6
+        uses: useblacksmith/build-push-action@v2
         with:
           context: .
           push: true