diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index b7be8a5..5aef7f4 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -47,93 +47,48 @@ jobs:
           echo "✓ Version files created:"
           cat ./publish/web/wwwroot/version.txt
 
-      - name: Setup SSH key
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.DEPLOY_SSH_KEY }}" > ~/.ssh/deploy_key
-          chmod 600 ~/.ssh/deploy_key
-          cat >> ~/.ssh/config << 'EOF'
-          Host deploy
-            HostName ${{ secrets.DEPLOY_HOST }}
-            User ${{ secrets.DEPLOY_USER }}
-            IdentityFile ~/.ssh/deploy_key
-            StrictHostKeyChecking no
-            UserKnownHostsFile /dev/null
-          EOF
-          chmod 644 ~/.ssh/config
-          echo "=== SSH Key Setup Complete ==="
-          ls -la ~/.ssh/
-
       - name: Deploy Web
         run: |
           WEB_TIMESTAMP=$(date +%Y%m%d_%H%M%S)
-          tar -czf web_publish.tar.gz -C publish web
-          scp web_publish.tar.gz deploy:/tmp/
+          WEB_DEPLOY_DIR="$HOME/deployments/taxbaik_${WEB_TIMESTAMP}"
 
-          ssh deploy /bin/bash << 'EOF'
-          WEB_TIMESTAMP=$(date +%Y%m%d_%H%M%S)
-          WEB_DEPLOY_DIR="/home/${{ secrets.DEPLOY_USER }}/deployments/taxbaik_${WEB_TIMESTAMP}"
+          echo "=== Deploying Web (v$COMMIT_HASH) ==="
           mkdir -p "$WEB_DEPLOY_DIR"
-
-          echo "=== Extracting deployment package ==="
-          tar -xzf /tmp/web_publish.tar.gz -C "$WEB_DEPLOY_DIR"
+          cp -r ./publish/web "$WEB_DEPLOY_DIR/"
           ln -sfn "$WEB_DEPLOY_DIR/web" ~/taxbaik_active
 
-          echo "=== Stopping existing TaxBaik.Web processes ==="
+          echo "=== Stopping TaxBaik.Web ==="
           pkill -9 -f "TaxBaik.Web" || true
-          sleep 5
+          sleep 3
 
-          echo "=== Verifying processes stopped ==="
-          ps aux | grep -E 'TaxBaik.Web|5001' | grep -v grep || echo "✓ All processes stopped"
-
-          echo "=== Starting new TaxBaik.Web process ==="
+          echo "=== Starting TaxBaik.Web ==="
           cd ~/taxbaik_active
           export ConnectionStrings__Default="Host=localhost;Database=taxbaikdb;Username=taxbaik;Password=taxbaik123"
           export ASPNETCORE_ENVIRONMENT=Production
           export ASPNETCORE_URLS=http://127.0.0.1:5001
           nohup /usr/local/dotnet/dotnet TaxBaik.Web.dll > web.log 2>&1 &
-          sleep 3
-
-          echo "=== Verifying new process started ==="
+          sleep 2
           ps aux | grep TaxBaik.Web | grep -v grep
-          cat ~/taxbaik_active/wwwroot/version.txt || echo "! Version file not found"
-
-          rm /tmp/web_publish.tar.gz
-          EOF
 
       - name: Deploy Admin
         run: |
           ADMIN_TIMESTAMP=$(date +%Y%m%d_%H%M%S)
-          tar -czf admin_publish.tar.gz -C publish admin
-          scp admin_publish.tar.gz deploy:/tmp/
+          ADMIN_DEPLOY_DIR="$HOME/deployments/taxbaik_admin_${ADMIN_TIMESTAMP}"
 
-          ssh deploy /bin/bash << 'EOF'
-          ADMIN_TIMESTAMP=$(date +%Y%m%d_%H%M%S)
-          ADMIN_DEPLOY_DIR="/home/${{ secrets.DEPLOY_USER }}/deployments/taxbaik_admin_${ADMIN_TIMESTAMP}"
+          echo "=== Deploying Admin (v$COMMIT_HASH) ==="
           mkdir -p "$ADMIN_DEPLOY_DIR"
-
-          echo "=== Extracting deployment package ==="
-          tar -xzf /tmp/admin_publish.tar.gz -C "$ADMIN_DEPLOY_DIR"
+          cp -r ./publish/admin "$ADMIN_DEPLOY_DIR/"
           ln -sfn "$ADMIN_DEPLOY_DIR/admin" ~/taxbaik_admin_active
 
-          echo "=== Stopping existing TaxBaik.Admin processes ==="
+          echo "=== Stopping TaxBaik.Admin ==="
           pkill -9 -f "TaxBaik.Admin" || true
-          sleep 5
+          sleep 3
 
-          echo "=== Verifying processes stopped ==="
-          ps aux | grep -E 'TaxBaik.Admin|5002' | grep -v grep || echo "✓ All processes stopped"
-
-          echo "=== Starting new TaxBaik.Admin process ==="
+          echo "=== Starting TaxBaik.Admin ==="
           cd ~/taxbaik_admin_active
           export ConnectionStrings__Default="Host=localhost;Database=taxbaikdb;Username=taxbaik;Password=taxbaik123"
           export ASPNETCORE_ENVIRONMENT=Production
           export ASPNETCORE_URLS=http://127.0.0.1:5002
           nohup /usr/local/dotnet/dotnet TaxBaik.Admin.dll > admin.log 2>&1 &
-          sleep 3
-
-          echo "=== Verifying new process started ==="
+          sleep 2
           ps aux | grep TaxBaik.Admin | grep -v grep
-          cat ~/taxbaik_admin_active/wwwroot/version.txt || echo "! Version file not found"
-
-          rm /tmp/admin_publish.tar.gz
-          EOF