diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 016c43b..4e190da 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,9 +4,7 @@ on:
   push:
     branches:
       - prod
-  pull_request:
-    branches:
-      - prod
+      - main
 
 jobs:
   next-build:
@@ -52,9 +50,10 @@ jobs:
           rm -rf .env
 
   ghcr-push:
-    needs: next-build # Job depends on next-build(above) job
+    needs: next-build
     runs-on: ubuntu-latest
     steps:
+      # Deploy to Production server
       - name: Deploy on Production server
         if: github.ref == 'refs/heads/prod'
         uses: appleboy/ssh-action@v0.1.7
@@ -70,3 +69,20 @@ jobs:
             echo ${{ secrets.GHCR_TOKEN }} | sudo docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin
             sudo docker pull ghcr.io/myriadflow/webxr:prod
             sudo docker run --name="webxr" -p 8080:3000 -d ghcr.io/myriadflow/webxr:prod
+
+      # Deploy to Development server
+      - name: Deploy on Development server
+        if: github.ref == 'refs/heads/main'
+        uses: appleboy/ssh-action@v0.1.7
+        with:
+          host: ${{ secrets.DEV_REMOTE_SERVER_ADDRESS }}
+          username: ${{ secrets.SERVER_USERNAME }}
+          key: ${{ secrets.DEV_REMOTE_SERVER_KEY }}
+          port: ${{ secrets.SSH_PORT }}
+          script: |
+            pwd
+            cd ~
+            sudo docker stop webxr && sudo docker rm webxr && sudo docker rmi ghcr.io/myriadflow/webxr:main
+            echo ${{ secrets.GHCR_TOKEN }} | sudo docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin
+            sudo docker pull ghcr.io/myriadflow/webxr:main
+            sudo docker run --name="webxr" -p 8080:3000 -d ghcr.io/myriadflow/webxr:main
diff --git a/.github/workflows/check_build.yml b/build_check.txt
similarity index 100%
rename from .github/workflows/check_build.yml
rename to build_check.txt