diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 1bdc184..5b519f4 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -2,10 +2,6 @@ name: Docker Build
 
 on:
   workflow_dispatch:
-  push:
-    branches: [ "main" ]
-    paths-ignore:
-      - '**/README.md'
 
 jobs:
   build:
diff --git a/.gitea/workflows/merge.yaml b/.gitea/workflows/merge.yaml
new file mode 100644
index 0000000..b7b99e8
--- /dev/null
+++ b/.gitea/workflows/merge.yaml
@@ -0,0 +1,25 @@
+name: Docker Merge
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+    paths-ignore:
+      - '**/README.md'
+
+jobs:
+  merge-docker-manifest:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Create and push manifest images
+        uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab
+        with:
+          inputs: ${{ vars.DOCKERHUB_REPO }}:latest
+          images: ${{ vars.DOCKERHUB_REPO }}:latest-amd64,${{ vars.DOCKERHUB_REPO }}:latest-arm64           
+        push: true