diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 0847133d..7e5c2ccc 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -29,16 +29,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
         with:
-          platforms: all
-
-#       # Use  Moby BuildKit
-#       - name: Set up Docker Buildx
-#         id: buildx
-#         uses: docker/setup-buildx-action@v1
-#         with:
-#           install: true
-#           version: latest
-#           driver-opts: image=moby/buildkit:master
+          platforms: linux/amd64, linux/arm64, linux/386, linux/ppc64le, linux/s390x
 
         # Login into GH container registry
       - name: Log in to registry
@@ -46,7 +37,7 @@ jobs:
 
         # Build the image from default Dockerfile
       - name: Build image
-        run: docker build . --file docker/Dockerfile-multi-arch --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
+        run: DOCKER_BUILDKIT=0 docker build . --file docker/Dockerfile-multi-arch --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
 
         # Push build image
       - name: Push image