diff --git a/.github/actions/docker-build-and-test/action.yml b/.github/actions/docker-build-and-test/action.yml
index 7fc938c6b8..0e47639377 100644
--- a/.github/actions/docker-build-and-test/action.yml
+++ b/.github/actions/docker-build-and-test/action.yml
@@ -91,7 +91,7 @@ runs:
         docker compose logs database
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: useblacksmith/setup-docker-builder@v1
       with:
         driver-opts: |
           network=container:database
@@ -100,7 +100,7 @@ runs:
 
     - name: Build image
       id: docker_build
-      uses: docker/build-push-action@v6
+      uses: useblacksmith/build-push-action@v2
       with:
         context: ./
         file: ./Dockerfile
@@ -159,7 +159,7 @@ runs:
 
     - name: Push image
       id: docker_push
-      uses: docker/build-push-action@v6
+      uses: useblacksmith/build-push-action@v2
       if: ${{ inputs.push-image == 'true' && !github.event.release.prerelease }}
       with:
         context: ./