Fix chained Workflows not running on correct branch

.github/workflows/build_images.yml

@@ -1,10 +1,7 @@
 name: "Build Docker Images"
 
 on:
-  workflow_run:
-    workflows: ["Run Tests"]
-    types:
-      - completed
+  workflow_call
 
 jobs:
   build:
@@ -38,3 +35,4 @@ jobs:
 
       - name: "Build Load"
         run: gcloud builds submit --config=dockerfiles/cloudbuild.yml --substitutions=_IMAGE_NAME="load" .
+

.github/workflows/on_pull_request.yml

@@ -0,0 +1,14 @@
+
+name: "On Pull Request"
+
+on:
+  pull_request:
+    branches: [ "prod", "dev" ]
+
+jobs:
+  on-push:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: "Run Tests"
+      uses: ./.github/workflows/test.yml@${GITHUB_REF##*/}

.github/workflows/on_push.yml

@@ -0,0 +1,18 @@
+
+name: "On Push"
+
+on:
+  push:
+    branches: [ "prod", "dev" ]
+
+jobs:
+  on-push:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: "Run Tests"
+      uses: ./.github/workflows/test.yml@${GITHUB_REF##*/}
+    - name: "Build Images"
+      uses: ./.github/workflows/build_images.yml@${GITHUB_REF##*/}
+    - name: "Terraform Apply"
+      uses: ./.github/workflows/terraform.yml@${GITHUB_REF##*/}

.github/workflows/terraform.yml

@@ -1,10 +1,7 @@
 name: 'Terraform Apply'
 
 on:
-  workflow_run:
-    workflows: ["Build Docker Images"]
-    types:
-      - completed
+  workflow_call
 
 jobs:
   terraform:

.github/workflows/test.yml

@@ -4,10 +4,7 @@
 name: 'Run Tests'
 
 on:
-  push:
-    branches: [ "prod", "dev" ]
-  pull_request:
-    branches: [ "prod", "dev" ]
+  workflow_call
 
 permissions:
   contents: read