diff --git a/.github/workflows/deploy-dev.yaml b/.github/workflows/deploy-dev.yaml
index f1edc35..e70c0cf 100644
--- a/.github/workflows/deploy-dev.yaml
+++ b/.github/workflows/deploy-dev.yaml
@@ -1,15 +1,14 @@
 name: deploy-dev
 
 on:
-  workflow_run:
-    workflows:
-      - check
-    types:
-      - completed
-    branches:
-      - dev
+  push:
+    branches: ['dev']
 
 jobs:
+  test:
+    uses: ./.github/workflows/test.yaml
+    with:
+      environment: dev
   aws-deploy:
     uses: "./.github/workflows/aws-deploy.yaml"
     with:
diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml
index 5ef839a..66b8598 100644
--- a/.github/workflows/deploy-prod.yaml
+++ b/.github/workflows/deploy-prod.yaml
@@ -1,15 +1,14 @@
 name: deploy-prod
 
 on:
-  workflow_run:
-    workflows:
-      - check
-    types:
-      - completed
-    branches:
-      - prod
+  push:
+    branches: ['prod']
 
 jobs:
+  test:
+    uses: ./.github/workflows/test.yaml
+    with:
+      environment: prod
   aws-deploy:
     uses: "./.github/workflows/aws-deploy.yaml"
     with:
diff --git a/.github/workflows/deploy-stage.yaml b/.github/workflows/deploy-stage.yaml
index 13a964d..c8a65c2 100644
--- a/.github/workflows/deploy-stage.yaml
+++ b/.github/workflows/deploy-stage.yaml
@@ -1,15 +1,14 @@
 name: deploy-stage
 
 on:
-  workflow_run:
-    workflows:
-      - check
-    types:
-      - completed
-    branches:
-      - stage
+  push:
+    branches: ['stage']
 
 jobs:
+  test:
+    uses: ./.github/workflows/test.yaml
+    with:
+      environment: stage
   aws-deploy:
     uses: "./.github/workflows/aws-deploy.yaml"
     with:
diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml
new file mode 100644
index 0000000..8921afe
--- /dev/null
+++ b/.github/workflows/pr-check.yaml
@@ -0,0 +1,11 @@
+name: pr-check
+
+on:
+  pull_request:
+    branches: ['*']
+
+jobs:
+  test:
+    uses: ./.github/workflows/test.yaml
+    with:
+      environment: dev
diff --git a/.github/workflows/check.yml b/.github/workflows/test.yaml
similarity index 84%
rename from .github/workflows/check.yml
rename to .github/workflows/test.yaml
index 8b08013..c1dc545 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/test.yaml
@@ -1,11 +1,11 @@
-name: check
+name: test
 
 on:
-  pull_request:
-    branches: ['*']
-  push:
-    branches: ['*']
-
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
 jobs:
   unit-tests:
     runs-on: ubuntu-latest
@@ -26,7 +26,7 @@ jobs:
       - name: Generate cloudformation
         uses: youyo/aws-cdk-github-actions@v2
         env:
-          ENV: dev
+          ENV: ${{ inputs.environment }}
         with:
           cdk_subcommand: 'synth'
           actions_comment: false