diff --git a/.github/workflows/smoke-tests-ess.yml b/.github/workflows/smoke-tests-ess.yml
index f15d9c7a84c..b8266ed40dd 100644
--- a/.github/workflows/smoke-tests-ess.yml
+++ b/.github/workflows/smoke-tests-ess.yml
@@ -66,23 +66,3 @@ jobs:
       - if: always()
         name: Teardown smoke test infra
         run: make smoketest/cleanup TEST_DIR=${{ matrix.test }}
-
-  all-smoke-tests-ess:
-    name: All Smoke Tests ESS
-    if: always()
-    runs-on: ubuntu-latest
-    needs:
-      - smoke-tests-ess
-    steps:
-      - id: check
-        uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
-        with:
-          needs: ${{ toJSON(needs) }}
-      - uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current
-        with:
-          status: ${{ steps.check.outputs.status }}
-          vaultUrl: ${{ secrets.VAULT_ADDR }}
-          vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
-          vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
-          slackChannel: "#apm-server"
-          message: "Build result for Smoke Tests ESS"
diff --git a/.github/workflows/smoke-tests-schedule.yml b/.github/workflows/smoke-tests-schedule.yml
index 0a32d3e0bda..02cacd9b60c 100644
--- a/.github/workflows/smoke-tests-schedule.yml
+++ b/.github/workflows/smoke-tests-schedule.yml
@@ -2,7 +2,7 @@ name: smoke-tests
 run-name: Smoke Tests
 
 on:
-  workflow_dispatch:
+  workflow_dispatch: ~
   schedule:
     - cron: '0 3 * * 1-5'
 
@@ -35,12 +35,20 @@ jobs:
       branch: ${{ matrix.branch }}
     secrets: inherit
 
-  all-smoke-tests-os:
-    name: All Smoke Tests OS
+  smoke-tests-ess:
+    name: Run smoke tests ESS
+    uses: ./.github/workflows/smoke-tests-ess.yml
+    with:
+      branch: 'main'
+    secrets: inherit
+
+  all-smoke-tests:
+    name: All Smoke Tests
     if: always()
     runs-on: ubuntu-latest
     needs:
       - smoke-tests-os
+      - smoke-tests-ess
     steps:
       - id: check
         uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current
@@ -53,10 +61,3 @@ jobs:
           vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
           vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
           slackChannel: "#apm-server"
-
-  smoke-tests-ess:
-    name: Run smoke tests ESS
-    uses: ./.github/workflows/smoke-tests-ess.yml
-    with:
-      branch: 'main'
-    secrets: inherit