diff --git a/.github/actions/setup-pnpm/action.yml b/.github/actions/setup-pnpm/action.yml
deleted file mode 100644
index 64939804de..0000000000
--- a/.github/actions/setup-pnpm/action.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Setup
-runs:
-  using: composite
-  steps:
-    - uses: pnpm/action-setup@v2
-      with:
-        version: 8.6.0
-
-    - uses: actions/setup-node@v3
-      with:
-        node-version-file: ".nvmrc"
-        registry-url: https://registry.npmjs.org
-
-    - name: Set up Bun
-      uses: oven-sh/setup-bun@v1
-
-    - name: Install Foundry
-      uses: foundry-rs/foundry-toolchain@v1
-      with:
-        version: nightly
-
-    # Workaround for parallel building with forge:
-    # https://github.com/foundry-rs/foundry/issues/4736
-    - name: Setup forge hack
-      shell: bash
-      run: forge build
-
-    - name: Install node modules
-      run: pnpm install
-      shell: bash
-
-    - name: Derive appropriate SHAs for base and head for `nx affected` commands
-      uses: nrwl/nx-set-shas@v3
-
-    - name: Echo nx shas
-      run: |
-        echo "nx using following shas:"
-        echo "BASE: ${{ env.NX_BASE }}"
-        echo "HEAD: ${{ env.NX_HEAD }}"
-      shell: bash
-
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0eeeab74cf..de692b86b5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,10 +18,10 @@ jobs:
           submodules: recursive
 
       - name: "Setup"
-        uses: ./.github/actions/setup-pnpm
+        uses: ./.github/actions/setup
 
       - name: Run tests
-        run: pnpm nx run-many --target=test:coverage
+        run: bun nx run-many --target=test:coverage
         env:
           NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
           RPC_URL_MAINNET: ${{ secrets.RPC_URL_MAINNET }}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
deleted file mode 100644
index 6358de3f58..0000000000
--- a/pnpm-workspace.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-packages:
-  - "bundlers/*"
-  - "blockexplorer"
-  - "cli"
-  - "config"
-  - "core"
-  - "blockexplorer"
-  - "docs"
-  - "e2e"
-  - "effect"
-  - "ethers"
-  - "examples/*"
-  - "experimental/*"
-  - "runtime"
-  - "schemas"
-  - "revm"
-  - "resolutions"
-  - "schemas"
-  - "solc"
-  - "state"
-  - "ts-plugin"
-  - "tsconfig"
-  - "viem-effect"
-