diff --git a/server/.github/workflows/test-build-deploy.yml b/server/.github/workflows/test-build-deploy.yml
index 6cef0cb9b..c91a59624 100644
--- a/server/.github/workflows/test-build-deploy.yml
+++ b/server/.github/workflows/test-build-deploy.yml
@@ -50,6 +50,7 @@ jobs:
   docker-push:
     runs-on: ubuntu-latest
     needs: [test]
+    if: github.event_name == 'push'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -88,7 +89,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: [docker-push]
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master' && github.event_name == 'push'
     steps:
       - name: Run deploy script on server
         uses: appleboy/ssh-action@master