diff --git a/.gitea/workflows/build_docker.yaml b/.gitea/workflows/build_docker.yaml
index 290d232..2653d80 100644
--- a/.gitea/workflows/build_docker.yaml
+++ b/.gitea/workflows/build_docker.yaml
@@ -52,3 +52,18 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}"
+
+  manifest:
+    name: Final Docker Image Manifest
+    runs-on: docker-x86
+    container: 
+      image: docker:dind
+      privileged: true
+    needs: build
+
+    steps:
+      - name: Build Docker Manifest
+        run: |
+          docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-x86_64 \
+            # ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-armv7l
+          docker manifest push --purge ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}