diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 888e839..b25b15f 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -53,6 +53,11 @@ jobs:
                   PLATFORM: "${{ matrix.platform }}"
                   IMAGE_TAG: "docker.io/botsudo/nut-upsd:${{ matrix.platform-tag }}-latest"
                   ACTION: push
+                  # Disable provenance to remove the attestation from the pushed image
+                  # See: https://github.com/docker/buildx/issues/1509
+                  # It makes: docker.io/botsudo/docker-rustpython:<arch>-latest a manifest list
+                  # And docker manifest create does not like that
+                  EXTRA_ARGS: "--provenance=false"
 
     sign-manifest:
         name: Sign the docker hub manifest
diff --git a/Makefile b/Makefile
index 1f2d524..1e56a41 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ PLATFORM ?= linux/amd64
 
 ACTION ?= load
 PROGRESS_MODE ?= plain
+EXTRA_ARGS ?=
 
 .PHONY: docker-build
 
@@ -16,4 +17,5 @@ docker-build:
 		--build-arg VCS_REF=`git rev-parse HEAD` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		--$(ACTION) \
+		$(EXTRA_ARGS) \
 		./docker