diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2acde8ef9..f27b8edcf 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -72,17 +72,12 @@ jobs:
     steps:
       - name: Run E2E base test suite
         if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
-        uses: convictional/trigger-workflow-and-wait@master
+        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
         with:
-          owner: standardnotes
-          repo: server
-          github_token: ${{ secrets.CI_PAT_TOKEN }}
-          workflow_file_name: e2e-test-suite.yml
-          wait_interval: 30
-          client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "base", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
-          propagate_failure: true
-          trigger_workflow: true
-          wait_workflow: true
+          snjs_image_tag: ${{ github.sha }}
+          suite: base
+          author: ${{ github.actor }}
+          ref_name: "app:${{ github.ref }}"
 
   e2e-vaults:
     name: E2E Vaults Test Suite
@@ -91,17 +86,12 @@ jobs:
     steps:
       - name: Run E2E vaults test suite
         if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
-        uses: convictional/trigger-workflow-and-wait@master
+        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
         with:
-          owner: standardnotes
-          repo: server
-          github_token: ${{ secrets.CI_PAT_TOKEN }}
-          workflow_file_name: e2e-test-suite.yml
-          wait_interval: 30
-          client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "vaults", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
-          propagate_failure: true
-          trigger_workflow: true
-          wait_workflow: true
+          snjs_image_tag: ${{ github.sha }}
+          suite: vaults
+          author: ${{ github.actor }}
+          ref_name: "app:${{ github.ref }}"
 
   publish:
     name: Publish to NPM
diff --git a/.github/workflows/snjs.pr.yml b/.github/workflows/snjs.pr.yml
index b53f178c3..79ac20e3b 100644
--- a/.github/workflows/snjs.pr.yml
+++ b/.github/workflows/snjs.pr.yml
@@ -79,17 +79,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Run E2E test suite
-        uses: convictional/trigger-workflow-and-wait@master
+        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
         with:
-          owner: standardnotes
-          repo: server
-          github_token: ${{ secrets.CI_PAT_TOKEN }}
-          workflow_file_name: e2e-test-suite.yml
-          wait_interval: 30
-          client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "base", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
-          propagate_failure: true
-          trigger_workflow: true
-          wait_workflow: true
+          snjs_image_tag: ${{ github.sha }}
+          suite: base
+          author: ${{ github.actor }}
+          ref_name: "app:${{ github.ref }}"
 
   e2e-vaults:
     name: E2E Vaults Test Suite
@@ -97,14 +92,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Run E2E vaults test suite
-        uses: convictional/trigger-workflow-and-wait@master
+        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
         with:
-          owner: standardnotes
-          repo: server
-          github_token: ${{ secrets.CI_PAT_TOKEN }}
-          workflow_file_name: e2e-test-suite.yml
-          wait_interval: 30
-          client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "vaults", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
-          propagate_failure: true
-          trigger_workflow: true
-          wait_workflow: true
+          snjs_image_tag: ${{ github.sha }}
+          suite: vaults
+          author: ${{ github.actor }}
+          ref_name: "app:${{ github.ref }}"