diff --git a/.github/workflows/bundlewatch.yml b/.github/workflows/build.yml
similarity index 91%
rename from .github/workflows/bundlewatch.yml
rename to .github/workflows/build.yml
index 1a95540d..25a7d3ee 100644
--- a/.github/workflows/bundlewatch.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: 'Run bundlewatch'
+name: 'Build and run bundlewatch'
 
 on:
   workflow_call:
@@ -7,7 +7,7 @@ env:
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
 jobs:
-  bundlewatch:
+  build:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 687adea5..1a954d40 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -21,19 +21,19 @@ jobs:
     uses: ./.github/workflows/setup.yml
     secrets: inherit
 
-  bundlewatch:
+  build:
     needs: setup
-    uses: ./.github/workflows/bundlewatch.yml
+    uses: ./.github/workflows/build.yml
     secrets: inherit
 
   test:
-    needs: setup
+    needs: build
     uses: ./.github/workflows/test.yml
     secrets: inherit
 
   rebase-prs:
     needs:
       - test
-      - bundlewatch
+      - build
     uses: ./.github/workflows/rebase-prs.yml
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9e38553a..035b1483 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,20 +31,14 @@ jobs:
       - uses: myparcelnl/actions/has-refs-between@v4
         id: has-refs
 
-  # Run setup initially to save cache and time on subsequent jobs
-  setup:
+  build:
     needs: prepare
     if: inputs.force == 'true' || needs.prepare.outputs.has-refs == 'true'
-    uses: ./.github/workflows/setup.yml
-    secrets: inherit
-
-  bundlewatch:
-    needs: setup
-    uses: ./.github/workflows/bundlewatch.yml
+    uses: ./.github/workflows/build.yml
     secrets: inherit
 
   test:
-    needs: setup
+    needs: build
     uses: ./.github/workflows/test.yml
     secrets: inherit
 
@@ -52,7 +46,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs:
       - test
-      - bundlewatch
+      - build
     steps:
       - uses: myparcelnl/actions/setup-git-credentials@v4
         id: credentials
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index e6cc1707..3b42a86a 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -18,17 +18,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # Run setup initially to save cache and time on subsequent jobs
-  setup:
-    uses: ./.github/workflows/setup.yml
-    secrets: inherit
-
-  bundlewatch:
-    needs: setup
-    uses: ./.github/workflows/bundlewatch.yml
+  build:
+    uses: ./.github/workflows/build.yml
     secrets: inherit
 
   test:
-    needs: setup
+    needs: build
     uses: ./.github/workflows/test.yml
     secrets: inherit
diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml
deleted file mode 100644
index d13c0a59..00000000
--- a/.github/workflows/setup.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 'Setup'
-
-on: workflow_call
-
-jobs:
-  setup:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: myparcelnl/actions/yarn-install@v4
-        with:
-          node-version: ${{ vars.NODE_VERSION }}