diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml
index 3484de5..63c88ec 100644
--- a/.gitea/workflows/deploy-dev.yml
+++ b/.gitea/workflows/deploy-dev.yml
@@ -8,25 +8,15 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Deploy to Dev Server
-        uses: appleboy/ssh-action@master
-        with:
-          host: 192.168.2.49
-          username: lars
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          script: |
-            cd /home/lars/docker/shinkan-dev
-
-            # Pull latest code
-            git pull origin develop || (git clone http://192.168.2.144:3000/Lars/shinkan-jinkendo.git . && git checkout develop)
-
-            # Build and restart containers
-            docker compose -f docker-compose.dev-env.yml down
-            docker compose -f docker-compose.dev-env.yml build --no-cache
-            docker compose -f docker-compose.dev-env.yml up -d
-
-            # Show status
-            docker compose -f docker-compose.dev-env.yml ps
+      - name: Deploy to Development
+        run: |
+          set -e
+          echo "=== Deploying Shinkan to DEVELOPMENT ==="
+          cd /home/lars/docker/shinkan-dev
+          git fetch origin develop || git clone http://192.168.2.144:3000/Lars/shinkan-jinkendo.git .
+          git reset --hard origin/develop
+          docker compose -f docker-compose.dev-env.yml build --no-cache
+          docker compose -f docker-compose.dev-env.yml up -d
+          sleep 5
+          curl -sf http://localhost:8098/api/version && echo "✓ DEV API healthy"
+          echo "=== Shinkan DEV Deploy complete ==="
diff --git a/.gitea/workflows/deploy-prod.yml b/.gitea/workflows/deploy-prod.yml
index d733c10..c4dd634 100644
--- a/.gitea/workflows/deploy-prod.yml
+++ b/.gitea/workflows/deploy-prod.yml
@@ -8,25 +8,15 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Deploy to Production Server
-        uses: appleboy/ssh-action@master
-        with:
-          host: 192.168.2.49
-          username: lars
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          script: |
-            cd /home/lars/docker/shinkan
-
-            # Pull latest code
-            git pull origin main || (git clone http://192.168.2.144:3000/Lars/shinkan-jinkendo.git . && git checkout main)
-
-            # Build and restart containers
-            docker compose down
-            docker compose build --no-cache
-            docker compose up -d
-
-            # Show status
-            docker compose ps
+      - name: Deploy to Production
+        run: |
+          set -e
+          echo "=== Deploying Shinkan to PRODUCTION ==="
+          cd /home/lars/docker/shinkan
+          git fetch origin main || git clone http://192.168.2.144:3000/Lars/shinkan-jinkendo.git .
+          git reset --hard origin/main
+          docker compose build --no-cache
+          docker compose up -d
+          sleep 5
+          curl -sf http://localhost:8003/api/version && echo "✓ PROD API healthy"
+          echo "=== Shinkan PROD Deploy complete ==="