diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 736cf3c..50bd014 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -37,18 +37,15 @@ jobs:
 
       - name: Generate build info
         run: |
+          mkdir -p ./publish/web/wwwroot ./publish/admin/wwwroot
           COMMIT_HASH=$(git rev-parse --short HEAD)
           BUILD_TIME=$(date -u +'%Y-%m-%d %H:%M:%S UTC')
-          echo "COMMIT_HASH=$COMMIT_HASH" >> $GITHUB_ENV
-          echo "BUILD_TIME=$BUILD_TIME" >> $GITHUB_ENV
-          cat > ./publish/web/wwwroot/version.txt <<EOF
-          Version: $COMMIT_HASH
-          Built: $BUILD_TIME
-          EOF
-          cat > ./publish/admin/wwwroot/version.txt <<EOF
-          Version: $COMMIT_HASH
-          Built: $BUILD_TIME
-          EOF
+          echo "Version: $COMMIT_HASH" > ./publish/web/wwwroot/version.txt
+          echo "Built: $BUILD_TIME" >> ./publish/web/wwwroot/version.txt
+          echo "Version: $COMMIT_HASH" > ./publish/admin/wwwroot/version.txt
+          echo "Built: $BUILD_TIME" >> ./publish/admin/wwwroot/version.txt
+          echo "✓ Version files created:"
+          cat ./publish/web/wwwroot/version.txt
 
       - name: Setup SSH key
         uses: webfactory/ssh-agent@v0.9.0
@@ -67,20 +64,30 @@ jobs:
           WEB_TIMESTAMP=$(date +%Y%m%d_%H%M%S)
           WEB_DEPLOY_DIR="/home/${{ secrets.DEPLOY_USER }}/deployments/taxbaik_${WEB_TIMESTAMP}"
           mkdir -p "$WEB_DEPLOY_DIR"
+
+          echo "=== Extracting deployment package ==="
           tar -xzf /tmp/web_publish.tar.gz -C "$WEB_DEPLOY_DIR"
           ln -sfn "$WEB_DEPLOY_DIR/web" ~/taxbaik_active
 
-          # Force kill any existing TaxBaik.Web process
+          echo "=== Stopping existing TaxBaik.Web processes ==="
           pkill -9 -f "TaxBaik.Web" || true
-          sleep 3
+          sleep 5
 
-          # Start new process
+          echo "=== Verifying processes stopped ==="
+          ps aux | grep -E 'TaxBaik.Web|5001' | grep -v grep || echo "✓ All processes stopped"
+
+          echo "=== Starting new TaxBaik.Web process ==="
           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 2
+          sleep 3
+
+          echo "=== Verifying new process started ==="
+          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
 
@@ -94,19 +101,29 @@ jobs:
           ADMIN_TIMESTAMP=$(date +%Y%m%d_%H%M%S)
           ADMIN_DEPLOY_DIR="/home/${{ secrets.DEPLOY_USER }}/deployments/taxbaik_admin_${ADMIN_TIMESTAMP}"
           mkdir -p "$ADMIN_DEPLOY_DIR"
+
+          echo "=== Extracting deployment package ==="
           tar -xzf /tmp/admin_publish.tar.gz -C "$ADMIN_DEPLOY_DIR"
           ln -sfn "$ADMIN_DEPLOY_DIR/admin" ~/taxbaik_admin_active
 
-          # Force kill any existing TaxBaik.Admin process
+          echo "=== Stopping existing TaxBaik.Admin processes ==="
           pkill -9 -f "TaxBaik.Admin" || true
-          sleep 3
+          sleep 5
 
-          # Start new process
+          echo "=== Verifying processes stopped ==="
+          ps aux | grep -E 'TaxBaik.Admin|5002' | grep -v grep || echo "✓ All processes stopped"
+
+          echo "=== Starting new TaxBaik.Admin process ==="
           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 2
+          sleep 3
+
+          echo "=== Verifying new process started ==="
+          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