diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e7ea162..6a0f91d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -296,17 +296,32 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Create and push manifest
+#      - name: Create and push manifest
+#        run: |
+#          AMD64_IMAGE=$(cat /tmp/digests/amd64/image.txt)
+#          ARM64_IMAGE=$(cat /tmp/digests/arm64/image.txt)
+#          REF_NAME=${GITHUB_REF#refs/tags/}
+#          MANIFEST_IMAGE="${{ inputs.image_name }}:$REF_NAME"
+#
+#          docker manifest create $MANIFEST_IMAGE $AMD64_IMAGE $ARM64_IMAGE
+#          docker manifest push $MANIFEST_IMAGE
+#
+#          if [ "${{ inputs.add_latest }}" = "true" ]; then
+#            docker manifest create ${{ inputs.image_name }}:latest $AMD64_IMAGE $ARM64_IMAGE
+#            docker manifest push ${{ inputs.image_name }}:latest
+#          fi
+
+      - name: Create and push manifest list
+        working-directory: /tmp/digests
         run: |
-          AMD64_IMAGE=$(cat /tmp/digests/amd64/image.txt)
-          ARM64_IMAGE=$(cat /tmp/digests/arm64/image.txt)
+          DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
           REF_NAME=${GITHUB_REF#refs/tags/}
           MANIFEST_IMAGE="${{ inputs.image_name }}:$REF_NAME"
 
-          docker manifest create $MANIFEST_IMAGE $AMD64_IMAGE $ARM64_IMAGE
-          docker manifest push $MANIFEST_IMAGE
+          docker buildx imagetools create $DOCKER_IMAGES -t $MANIFEST_IMAGE
+          docker buildx imagetools inspect $MANIFEST_IMAGE
 
           if [ "${{ inputs.add_latest }}" = "true" ]; then
-            docker manifest create ${{ inputs.image_name }}:latest $AMD64_IMAGE $ARM64_IMAGE
-            docker manifest push ${{ inputs.image_name }}:latest
-          fi
+            docker buildx imagetools create $DOCKER_IMAGES -t ${{ inputs.image_name }}:latest
+            docker buildx imagetools inspect ${{ inputs.image_name }}:latest
+          fi
\ No newline at end of file
diff --git a/CITATION.cff b/CITATION.cff
index 79b2363..9a91228 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -22,5 +22,5 @@ keywords:
   - self-hosted
   - portabase
 license: Apache-2.0
-version: 1.0.4-rc.19
+version: 1.0.4-rc.20
 date-released: "2026-01-28"
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index a476c0d..5f0e50c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1595,7 +1595,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "portabase-agent"
-version = "1.0.4-rc.18"
+version = "1.0.4-rc.19"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index eaa4d3f..09e4812 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "portabase-agent"
-version = "1.0.4-rc.19"
+version = "1.0.4-rc.20"
 edition = "2024"
 
 [dependencies]