diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 0e5cf0c..5d96356 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -2,6 +2,10 @@ name: Docker Build
 
 on:
   workflow_dispatch:
+  push:
+    branches: [ "main" ]
+    paths-ignore:
+      - '**/README.md'
 
 jobs:
   build:
@@ -9,6 +13,7 @@ jobs:
       matrix:
         config:
           - {arch: 'arm64'}
+          - {arch: 'amd64'}
     runs-on: ${{ matrix.config.arch == 'arm64' && 'ubuntu-arm64' || 'ubuntu-amd64' }}
     steps:
       - name: Checkout
@@ -26,7 +31,7 @@ jobs:
       - name: Build and Push Docker images for all Container Registries
         uses: docker/build-push-action@v6
         with:
-          tags: ${{ vars.DOCKERHUB_REPO }}:latest-${{matrix.config.arch}}
+          tags: ${{ vars.DOCKERHUB_REPO }}:${{ vars.VERSION }}-${{matrix.config.arch}}, ${{ vars.DOCKERHUB_REPO }}:latest-${{matrix.config.arch}}
           file: Dockerfile 
           push: true
 
@@ -39,9 +44,17 @@ jobs:
         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
+
+      - name: Create and push manifest images for pinned
+        uses: Noelware/docker-manifest-action@v1
         with:
-          inputs: ${{ vars.DOCKERHUB_REPO }}:latest
-          tags: ${{ vars.DOCKERHUB_REPO }}:latest-arm64           
+          inputs: ${{ vars.DOCKERHUB_REPO }}:${{ vars.VERSION }}-arm64,${{ vars.DOCKERHUB_REPO }}:${{ vars.VERSION }}-amd64
+          tags: ${{ vars.DOCKERHUB_REPO }}:${{ vars.VERSION }}
+        push: true
+
+      - name: Create and push manifest images for latest
+        uses: Noelware/docker-manifest-action@v1
+        with:
+          inputs: ${{ vars.DOCKERHUB_REPO }}:latest-arm64,${{ vars.DOCKERHUB_REPO }}:latest-amd64
+          tags: ${{ vars.DOCKERHUB_REPO }}:latest
         push: true
diff --git a/.gitea/workflows/merge.yaml b/.gitea/workflows/merge.yaml
index 4f08abb..f64a713 100644
--- a/.gitea/workflows/merge.yaml
+++ b/.gitea/workflows/merge.yaml
@@ -2,10 +2,6 @@ name: Docker Merge
 
 on:
   workflow_dispatch:
-  push:
-    branches: [ "main" ]
-    paths-ignore:
-      - '**/README.md'
 
 jobs:
   merge-docker-manifest: