diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f27b8edcf..35ef3f6ee 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -68,30 +68,24 @@ jobs:
   e2e-base:
     name: E2E Base Test Suite
     needs: build-docker
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run E2E base test suite
-        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
-        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
-        with:
-          snjs_image_tag: ${{ github.sha }}
-          suite: base
-          author: ${{ github.actor }}
-          ref_name: "app:${{ github.ref }}"
+    if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
+    uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
+    with:
+      snjs_image_tag: ${{ github.sha }}
+      suite: base
+      author: ${{ github.actor }}
+      ref_name: "app:${{ github.ref }}"
 
   e2e-vaults:
     name: E2E Vaults Test Suite
     needs: build-docker
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run E2E vaults test suite
-        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
-        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
-        with:
-          snjs_image_tag: ${{ github.sha }}
-          suite: vaults
-          author: ${{ github.actor }}
-          ref_name: "app:${{ github.ref }}"
+    if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
+    uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
+    with:
+      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 79ac20e3b..e9b630b54 100644
--- a/.github/workflows/snjs.pr.yml
+++ b/.github/workflows/snjs.pr.yml
@@ -76,25 +76,19 @@ jobs:
   e2e-base:
     name: E2E Base Test Suite
     needs: build-docker
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run E2E test suite
-        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
-        with:
-          snjs_image_tag: ${{ github.sha }}
-          suite: base
-          author: ${{ github.actor }}
-          ref_name: "app:${{ github.ref }}"
+    uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
+    with:
+      snjs_image_tag: ${{ github.sha }}
+      suite: base
+      author: ${{ github.actor }}
+      ref_name: "app:${{ github.ref }}"
 
   e2e-vaults:
     name: E2E Vaults Test Suite
     needs: build-docker
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run E2E vaults test suite
-        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
-        with:
-          snjs_image_tag: ${{ github.sha }}
-          suite: vaults
-          author: ${{ github.actor }}
-          ref_name: "app:${{ github.ref }}"
+    uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
+    with:
+      snjs_image_tag: ${{ github.sha }}
+      suite: vaults
+      author: ${{ github.actor }}
+      ref_name: "app:${{ github.ref }}"