diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index cfe2379..736cf3c 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -62,49 +62,51 @@ jobs:
           echo "${{ secrets.DEPLOY_HOST }}" >> ~/.ssh/known_hosts || true
           tar -czf web_publish.tar.gz -C publish web
           scp web_publish.tar.gz ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }}:/tmp/
-          ssh ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} << 'EOFWEB'
+
+          ssh ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} /bin/bash << 'EOF'
+          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"
           tar -xzf /tmp/web_publish.tar.gz -C "$WEB_DEPLOY_DIR"
           ln -sfn "$WEB_DEPLOY_DIR/web" ~/taxbaik_active
-          pkill -f "TaxBaik.Web" || true
-          # Wait for port 5001 to be released
-          for i in {1..30}; do
-            if ! lsof -Pi :5001 -sTCP:LISTEN -t >/dev/null 2>&1; then
-              break
-            fi
-            sleep 1
-          done
+
+          # Force kill any existing TaxBaik.Web process
+          pkill -9 -f "TaxBaik.Web" || true
+          sleep 3
+
+          # Start new 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
           rm /tmp/web_publish.tar.gz
-          EOFWEB
+          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 ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }}:/tmp/
-          ssh ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} << 'EOFADMIN'
+
+          ssh ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} /bin/bash << 'EOF'
+          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"
           tar -xzf /tmp/admin_publish.tar.gz -C "$ADMIN_DEPLOY_DIR"
           ln -sfn "$ADMIN_DEPLOY_DIR/admin" ~/taxbaik_admin_active
-          pkill -f "TaxBaik.Admin" || true
-          # Wait for port 5002 to be released
-          for i in {1..30}; do
-            if ! lsof -Pi :5002 -sTCP:LISTEN -t >/dev/null 2>&1; then
-              break
-            fi
-            sleep 1
-          done
+
+          # Force kill any existing TaxBaik.Admin process
+          pkill -9 -f "TaxBaik.Admin" || true
+          sleep 3
+
+          # Start new 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
           rm /tmp/admin_publish.tar.gz
-          EOFADMIN
+          EOF