diff --git a/.github/workflows/common-self-hosting.yml b/.github/workflows/common-self-hosting.yml
index dded9b702..ee0127fc6 100644
--- a/.github/workflows/common-self-hosting.yml
+++ b/.github/workflows/common-self-hosting.yml
@@ -13,16 +13,9 @@ on:
         required: true
 
 jobs:
-  e2e:
-    name: E2E
-    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
-    secrets: inherit
-
   publish:
     runs-on: ubuntu-latest
 
-    needs: e2e
-
     steps:
     - uses: actions/checkout@v3
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1b5592c98..cd1245280 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -88,15 +88,22 @@ jobs:
     - name: Test
       run: yarn test
 
+  e2e:
+    name: E2E
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    secrets: inherit
+
   publish-self-hosting:
-    needs: [ test, lint ]
+    needs: [ test, lint, e2e ]
     name: Publish Self Hosting Docker Image
     uses: standardnotes/server/.github/workflows/common-self-hosting.yml@main
     secrets: inherit
 
   publish-services:
+    needs: [ test, lint, e2e ]
+
     runs-on: ubuntu-latest
-    needs: publish-self-hosting
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3