diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml
index 7a51ac2..184562b 100644
--- a/.github/workflows/build-push.yaml
+++ b/.github/workflows/build-push.yaml
@@ -43,7 +43,7 @@ jobs:
           TARGETARCH: ${{ matrix.targetarch }}
         run: |
           make "${TARGETARCH}"
-          buildah push "${CONTAINER}-${TARGETARCH}" "docker-archive:/tmp/image-${TARGETARCH}.tar:${CONTAINER}-${TARGETARCH}"
+          buildah push --format v2s2 "${CONTAINER}-${TARGETARCH}" "docker-archive:/tmp/image-${TARGETARCH}.tar:${CONTAINER}-${TARGETARCH}"
 
       - name: Upload image artifact
         uses: actions/upload-artifact@v4
diff --git a/Makefile b/Makefile
index c845223..5f2ab84 100644
--- a/Makefile
+++ b/Makefile
@@ -149,4 +149,4 @@ podman-build-arm64: ## build the container in arm64
 .PHONY: upload
 upload: ## Uploads the container to quay.io/validatedpatterns/${CONTAINER}
 	@echo "Uploading the ${REGISTRY}/${CONTAINER} container to ${UPLOADREGISTRY}/${CONTAINER}"
-	buildah manifest push --all "${REGISTRY}/${CONTAINER}" "docker://${UPLOADREGISTRY}/${CONTAINER}"
+	buildah manifest push --all --format v2s2 "${REGISTRY}/${CONTAINER}" "docker://${UPLOADREGISTRY}/${CONTAINER}"