diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 4e21eef..d7d7e38 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -95,6 +95,10 @@ jobs:
       - &setup-buildx
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f #v3.12.0
+        with:
+          # Buildx version 0.31.1 broke our publish workflow, this need to be revised when 0.32.0 is released
+          # https://github.com/docker/buildx/releases/tag/v0.31.1
+          version: v0.31.0
 
       - name: Build container and push by digest
         id: build