diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 692d56d..53def92 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ env:
 jobs:
   machete:
     name: Check for Unneeded Dependencies
-    runs-on: ubuntu-24.04
+    runs-on: parity-large
     env:
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
@@ -39,7 +39,7 @@ jobs:
         run: cargo make machete
   check-fmt:
     name: Check Formatting
-    runs-on: ubuntu-24.04
+    runs-on: parity-large
     env:
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
@@ -58,7 +58,7 @@ jobs:
         run: cargo make fmt-check
   check-clippy:
     name: Check Clippy Lints
-    runs-on: ubuntu-24.04
+    runs-on: parity-large
     env:
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
@@ -81,7 +81,7 @@ jobs:
     needs: cache-polkadot
     strategy:
       matrix:
-        os: [ubuntu-24.04, macos-14]
+        os: [parity-large, parity-macos]
     env:
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
@@ -115,7 +115,7 @@ jobs:
             ~/.cargo/bin/revive-dev-node
           key: polkadot-binaries-${{ env.POLKADOT_SDK_COMMIT_HASH }}-${{ matrix.os }}
       - name: Install Geth on Ubuntu
-        if: matrix.os == 'ubuntu-24.04'
+        if: matrix.os == 'parity-large'
         run: |
           sudo add-apt-repository -y ppa:ethereum/ethereum
           sudo apt-get update
@@ -147,7 +147,7 @@ jobs:
           chmod +x resolc
           sudo mv resolc /usr/local/bin
       - name: Install Geth on macOS
-        if: matrix.os == 'macos-14'
+        if: matrix.os == 'parity-macos'
         run: |
           brew tap ethereum/ethereum
           brew install ethereum protobuf
@@ -158,10 +158,10 @@ jobs:
           chmod +x resolc
           sudo mv resolc /usr/local/bin
       - name: Install Kurtosis on macOS
-        if: matrix.os == 'macos-14'
+        if: matrix.os == 'parity-macos'
         run: brew install kurtosis-tech/tap/kurtosis-cli
       - name: Install Kurtosis on Ubuntu
-        if: matrix.os == 'ubuntu-24.04'
+        if: matrix.os == 'parity-large'
         run: |
           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
           sudo apt update
@@ -173,7 +173,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, macos-14]
+        os: [parity-large, parity-macos]
     env:
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
@@ -196,12 +196,12 @@ jobs:
           toolchain: "1.90.0"
 
       - name: Install dependencies (Linux)
-        if: matrix.os == 'ubuntu-24.04'
+        if: matrix.os == 'parity-large'
         run: |
           sudo apt-get update
           sudo apt-get install -y protobuf-compiler clang libclang-dev
       - name: Install dependencies (macOS)
-        if: matrix.os == 'macos-14'
+        if: matrix.os == 'parity-macos'
         run: |
           brew install protobuf llvm
           LLVM_PREFIX="$(brew --prefix llvm)"
@@ -274,7 +274,7 @@ jobs:
 #     runs-on: ${{ matrix.os }}
 #     strategy:
 #       matrix:
-#         os: [ubuntu-24.04, macos-14]
+#         os: [parity-large, parity-macos]
 
 #     steps:
 #       - name: Checkout repo and submodules
@@ -283,7 +283,7 @@ jobs:
 #           submodules: recursive
 
 #       - name: Install dependencies (Linux)
-#         if: matrix.os == 'ubuntu-24.04'
+#         if: matrix.os == 'parity-large'
 #         run: |
 #           sudo apt-get update
 #           sudo apt-get install -y protobuf-compiler clang libclang-dev
@@ -291,7 +291,7 @@ jobs:
 #           rustup component add rust-src
 
 #       - name: Install dependencies (macOS)
-#         if: matrix.os == 'macos-14'
+#         if: matrix.os == 'parity-macos'
 #         run: |
 #           brew install protobuf
 #           rustup target add wasm32-unknown-unknown
@@ -330,7 +330,7 @@ jobs:
 #           key: polkadot-downloaded-${{ matrix.os }}-${{ env.POLKADOT_VERSION }}
 
 #       - name: Download Polkadot binaries on macOS
-#         if: matrix.os == 'macos-14' && steps.cache-polkadot.outputs.cache-hit != 'true'
+#         if: matrix.os == 'parity-macos' && steps.cache-polkadot.outputs.cache-hit != 'true'
 #         run: |
 #           mkdir -p ~/polkadot-cache
 #           curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot-aarch64-apple-darwin -o ~/polkadot-cache/polkadot
@@ -340,7 +340,7 @@ jobs:
 #           chmod +x ~/polkadot-cache/*
 
 #       - name: Download Polkadot binaries on Ubuntu
-#         if: matrix.os == 'ubuntu-24.04' && steps.cache-polkadot.outputs.cache-hit != 'true'
+#         if: matrix.os == 'parity-large' && steps.cache-polkadot.outputs.cache-hit != 'true'
 #         run: |
 #           mkdir -p ~/polkadot-cache
 #           curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot -o ~/polkadot-cache/polkadot
@@ -355,7 +355,7 @@ jobs:
 #     runs-on: ${{ matrix.os }}
 #     strategy:
 #       matrix:
-#         os: [ubuntu-24.04, macos-14]
+#         os: [parity-large, parity-macos]
 
 #     steps:
 #       - name: Checkout repo
@@ -400,7 +400,7 @@ jobs:
 #           rustup component add rust-src rustfmt clippy
 
 #       - name: Install Geth on Ubuntu
-#         if: matrix.os == 'ubuntu-24.04'
+#         if: matrix.os == 'parity-large'
 #         run: |
 #           sudo add-apt-repository -y ppa:ethereum/ethereum
 #           sudo apt-get update
@@ -433,7 +433,7 @@ jobs:
 #           sudo mv resolc /usr/local/bin
 
 #       - name: Install Geth on macOS
-#         if: matrix.os == 'macos-14'
+#         if: matrix.os == 'parity-macos'
 #         run: |
 #           brew tap ethereum/ethereum
 #           brew install ethereum protobuf
@@ -445,11 +445,11 @@ jobs:
 #           sudo mv resolc /usr/local/bin
 
 #       - name: Install Kurtosis on macOS
-#         if: matrix.os == 'macos-14'
+#         if: matrix.os == 'parity-macos'
 #         run: brew install kurtosis-tech/tap/kurtosis-cli
 
 #       - name: Install Kurtosis on Ubuntu
-#         if: matrix.os == 'ubuntu-24.04'
+#         if: matrix.os == 'parity-large'
 #         run: |
 #           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
 #           sudo apt update
@@ -500,12 +500,12 @@ jobs:
 #         run: make machete
 
 #       - name: Unit Tests
-#         if: matrix.os == 'ubuntu-24.04'
+#         if: matrix.os == 'parity-large'
 #         run: cargo test --workspace -- --nocapture
 
 #       # We can't install docker in the MacOS image used in CI and therefore we need to skip the
 #       # Kurtosis and lighthouse related tests when running the CI on MacOS.
 #       - name: Unit Tests
-#         if: matrix.os == 'macos-14'
+#         if: matrix.os == 'parity-macos'
 #         run: |
 #           cargo test --workspace -- --nocapture --skip lighthouse_geth::tests::