diff --git a/Makefile b/Makefile
index 73e71e29..eb2137c6 100644
--- a/Makefile
+++ b/Makefile
@@ -150,14 +150,14 @@ gen-crd-doc: .gen-crd-doc-kiali .gen-crd-doc-ossmconsole
 .ensure-buildx-builder: .ensure-docker-buildx
 	@if ! docker buildx inspect kiali-builder > /dev/null 2>&1; then \
 	  echo "The buildx builder instance named 'kiali-builder' does not exist. Creating one now."; \
-	  if ! docker buildx create --name=kiali-builder --driver-opt=image=moby/buildkit:v0.8.0; then \
+	  if ! docker buildx create --name=kiali-builder --driver-opt=image=moby/buildkit:v0.13.2; then \
 	    echo "Failed to create the buildx builder 'kiali-builder'"; \
 	    exit 1; \
 	  fi \
 	fi; \
 	if [[ $$(uname -s) == "Linux" ]]; then \
 	  echo "Ensuring QEMU is set up for this Linux host"; \
-	  if ! docker run --privileged --rm quay.io/kiali/binfmt:latest --install all; then \
+	  if ! docker run --privileged --rm tonistiigi/binfmt:latest --install all; then \
 	    echo "Failed to ensure QEMU is set up. This build will be allowed to continue, but it may fail at a later step."; \
 	  fi \
 	fi