diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index 6e73381..f55d604 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -154,18 +154,18 @@ jobs:
         run: |
           if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
             VERSION=${GITHUB_REF#refs/tags/}
-            docker manifest create icereed/paperless-gpt:${VERSION} \
-              icereed/paperless-gpt:${VERSION}-amd64 \
-              icereed/paperless-gpt:${VERSION}-arm64
-            docker manifest push icereed/paperless-gpt:${VERSION}
+            docker manifest create icereed/paperless-gpt:${VERSION} --amend \
+              --annotate icereed/paperless-gpt:${VERSION}-amd64 linux/amd64 \
+              --annotate icereed/paperless-gpt:${VERSION}-arm64 linux/arm64
+            docker manifest push --purge icereed/paperless-gpt:${VERSION}
             
-            docker manifest create icereed/paperless-gpt:latest \
-              icereed/paperless-gpt:${VERSION}-amd64 \
-              icereed/paperless-gpt:${VERSION}-arm64
-            docker manifest push icereed/paperless-gpt:latest
+            docker manifest create icereed/paperless-gpt:latest --amend \
+              --annotate icereed/paperless-gpt:${VERSION}-amd64 linux/amd64 \
+              --annotate icereed/paperless-gpt:${VERSION}-arm64 linux/arm64
+            docker manifest push --purge icereed/paperless-gpt:latest
           else
-            docker manifest create icereed/paperless-gpt:unreleased \
-              icereed/paperless-gpt:unreleased-amd64 \
-              icereed/paperless-gpt:unreleased-arm64
-            docker manifest push icereed/paperless-gpt:unreleased
+            docker manifest create icereed/paperless-gpt:unreleased --amend \
+              --annotate icereed/paperless-gpt:unreleased-amd64 linux/amd64 \
+              --annotate icereed/paperless-gpt:unreleased-arm64 linux/arm64
+            docker manifest push --purge icereed/paperless-gpt:unreleased
           fi
\ No newline at end of file