diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
index 7dbab8525fb..1f339d75a9a 100644
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -9,11 +9,6 @@ on:
         description: "This is the PR number in case the workflow is being called in a pull request"
         required: false
         type: number
-      is-pg-build:
-        description: "This is a boolean value in case the workflow is being called for a PG build"
-        required: false
-        type: string
-        default: "false"
 
 jobs:
   build-docker:
diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
index 9384df2101e..803dcbc73d6 100644
--- a/.github/workflows/test-build-docker-image.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -23,7 +23,7 @@ on:
 
   # trigger for pushes to master and pg
   push:
-    branches: [master, pg]
+    branches: [master]
     paths:
       - "app/client/**"
       - "app/server/**"
@@ -59,6 +59,14 @@ jobs:
             echo "matrix=[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59]" >> $GITHUB_OUTPUT
           fi
 
+  invoke-tbp-workflow-for-pg:
+    needs: [setup]
+    if: github.event_name != 'push' && github.ref == 'refs/heads/release'
+    uses: benc-uk/workflow-dispatch@v1
+    with:
+      workflow: test-build-docker-image.yml
+      inputs: '{ "ref": "pg"}'
+
   server-build:
     needs: [setup]
     if: success()
@@ -100,7 +108,7 @@ jobs:
   ci-test:
     needs: [setup, build-docker-image]
     # Only run if the build step is successful
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master')
     name: ci-test
     uses: ./.github/workflows/ci-test-custom-script.yml
     secrets: inherit
@@ -113,17 +121,18 @@ jobs:
   server-unit-tests:
     name: server-unit-tests
     needs: [build-docker-image]
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master')
     uses: ./.github/workflows/server-build.yml
     secrets: inherit
     with:
       pr: 0
       skip-tests: false
+      is-pg-build: ${{ github.ref == 'refs/heads/pg' }}
 
   client-unit-tests:
     name: client-unit-tests
     needs: [build-docker-image]
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master')
     uses: ./.github/workflows/client-unit-tests.yml
     secrets: inherit
     with: