diff --git a/.github/workflows/build-and-deploy-beta.yml b/.github/workflows/build-and-deploy-beta.yml
index 6118aa0f1..417812353 100644
--- a/.github/workflows/build-and-deploy-beta.yml
+++ b/.github/workflows/build-and-deploy-beta.yml
@@ -1,10 +1,9 @@
 name: Build and deploy GovTool to BETA server
 run-name: Deploy by @${{ github.actor }}
 
+# That should be executed on create: tag event
 on:
-  push:
-    branches:
-      - main
+  workflow_dispatch:
 
 env:
   ENVIRONMENT: "beta"
diff --git a/.github/workflows/build-and-deploy-staging.yml b/.github/workflows/build-and-deploy-staging.yml
index 8c46e0d9d..a1d97e720 100644
--- a/.github/workflows/build-and-deploy-staging.yml
+++ b/.github/workflows/build-and-deploy-staging.yml
@@ -2,9 +2,11 @@ name: Build and deploy GovTool to STAGING server
 run-name: Deploy by @${{ github.actor }}
 
 on:
-  push:
+  pull_request:
     branches:
       - staging
+    types:
+      - closed
 
 env:
   ENVIRONMENT: "staging"
diff --git a/.github/workflows/build-and-deploy-test.yml b/.github/workflows/build-and-deploy-test.yml
index 9b94bc6dc..61c802573 100644
--- a/.github/workflows/build-and-deploy-test.yml
+++ b/.github/workflows/build-and-deploy-test.yml
@@ -2,9 +2,11 @@ name: Build and deploy GovTool to TEST server
 run-name: Deploy by @${{ github.actor }}
 
 on:
-  push:
+  pull_request:
     branches:
       - test
+    types:
+      - closed
 
 env:
   ENVIRONMENT: "test"