diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
new file mode 100644
index 0000000..a00c10e
--- /dev/null
+++ b/.gitea/workflows/deploy.yml
@@ -0,0 +1,13 @@
+name: Deploy
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_COMPOSE: IMAGE_TAG=${{ gitea.ref_name }} docker compose --ansi=never -f=compose.yaml -f=compose.prod.yaml
+    steps:
diff --git a/.gitea/workflows/release-nightly.yml b/.gitea/workflows/release-nightly.yml
index 0cfbd0c..9a36613 100644
--- a/.gitea/workflows/release-nightly.yml
+++ b/.gitea/workflows/release-nightly.yml
@@ -10,7 +10,6 @@ jobs:
     container:
       image: catthehacker/ubuntu:act-latest
     env:
-      DOCKER_ORG: gitea
       DOCKER_LATEST: nightly
     steps:
       - name: Checkout
@@ -44,7 +43,6 @@ jobs:
           context: .
           file: ./Containerfile
           platforms: |
-            linux/amd64
             linux/arm/v7
           push: true
           tags: |
diff --git a/.gitea/workflows/release-tag.yml b/.gitea/workflows/release-tag.yml
index 56d233e..570c1a1 100644
--- a/.gitea/workflows/release-tag.yml
+++ b/.gitea/workflows/release-tag.yml
@@ -11,7 +11,6 @@ jobs:
     container:
       image: catthehacker/ubuntu:act-latest
     env:
-      DOCKER_ORG: marijn
       DOCKER_LATEST: latest
     steps:
       - name: Checkout
@@ -46,9 +45,23 @@ jobs:
           context: .
           file: ./Containerfile
           platforms: |
-            linux/arm64
             linux/arm/v7
           push: true
           tags: |
             gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
             gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
+
+      - name: Deploy Image to Sever
+        id: deploy
+        env:
+          DOCKER_COMPOSE: IMAGE_TAG=${{ gitea.ref_name }} docker compose --ansi=never -f=compose.yaml -f=compose.prod.yaml
+        uses: https://github.com/appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.KEY }}
+          port: ${{ secrets.PORT }}
+          script: |
+            cd /opt/projectorpi-web
+            ${{ env.DOCKER_COMPOSE }} pull
+            ${{ env.DOCKER_COMPOSE }} up -d
diff --git a/compose.prod.yaml b/compose.prod.yaml
index a7ae4c9..daf5740 100644
--- a/compose.prod.yaml
+++ b/compose.prod.yaml
@@ -1,3 +1,3 @@
 services:
   app:
-    image: gitea.marijndoeve.nl/marijn/projectorpi-web:${IMAGE_TAG:-nightly}
+    image: gitea.marijndoeve.nl/marijn/projectorpi-web:${IMAGE_TAG:-latest}