diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 0203a4654a0..52c81303cf2 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -15,8 +15,7 @@ env:
 name: bench
 jobs:
   codspeed:
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
         with:
diff --git a/.github/workflows/compact.yml b/.github/workflows/compact.yml
index 8a18df872d2..884bd3300c7 100644
--- a/.github/workflows/compact.yml
+++ b/.github/workflows/compact.yml
@@ -17,8 +17,7 @@ env:
 name: compact-codec
 jobs:
   compact-codec:
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         bin:
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 16c9fb2f613..80cff59e893 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -19,8 +19,7 @@ concurrency:
 jobs:
   test:
     name: e2e-testsuite
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 90
diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml
index 13a952e6875..17fc1febf6d 100644
--- a/.github/workflows/hive.yml
+++ b/.github/workflows/hive.yml
@@ -22,10 +22,9 @@ jobs:
       binary_name: reth
 
   prepare-hive:
-    if: github.repository == 'paradigmxyz/reth'
+    if: github.repository == 'op-rs/op-reth'
     timeout-minutes: 45
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
       - name: Checkout hive tests
@@ -175,8 +174,7 @@ jobs:
       - prepare-reth
       - prepare-hive
     name: run ${{ matrix.scenario.sim }}${{ matrix.scenario.limit && format(' - {0}', matrix.scenario.limit) }}
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     permissions:
       issues: write
     steps:
@@ -243,8 +241,7 @@ jobs:
   notify-on-error:
     needs: test
     if: failure()
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     steps:
       - name: Slack Webhook Action
         uses: rtCamp/action-slack-notify@v2
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 90e3287917e..a5e49615edf 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -23,8 +23,7 @@ jobs:
   test:
     name: test / ${{ matrix.network }}
     if: github.event_name != 'schedule'
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     strategy:
diff --git a/.github/workflows/kurtosis-op.yml b/.github/workflows/kurtosis-op.yml
index 0e08d1641de..28f7f4c0c48 100644
--- a/.github/workflows/kurtosis-op.yml
+++ b/.github/workflows/kurtosis-op.yml
@@ -32,8 +32,7 @@ jobs:
     strategy:
       fail-fast: false
     name: run kurtosis
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     needs:
       - prepare-reth
     steps:
@@ -87,8 +86,7 @@ jobs:
   notify-on-error:
     needs: test
     if: failure()
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     steps:
       - name: Slack Webhook Action
         uses: rtCamp/action-slack-notify@v2
diff --git a/.github/workflows/kurtosis.yml b/.github/workflows/kurtosis.yml
index f78fc81235a..9a01c6f1263 100644
--- a/.github/workflows/kurtosis.yml
+++ b/.github/workflows/kurtosis.yml
@@ -30,8 +30,7 @@ jobs:
     strategy:
       fail-fast: false
     name: run kurtosis
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     needs:
       - prepare-reth
     steps:
@@ -59,8 +58,7 @@ jobs:
   notify-on-error:
     needs: test
     if: failure()
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     steps:
       - name: Slack Webhook Action
         uses: rtCamp/action-slack-notify@v2
diff --git a/.github/workflows/prepare-reth.yml b/.github/workflows/prepare-reth.yml
index 37a9445af72..ef6ba5a6d33 100644
--- a/.github/workflows/prepare-reth.yml
+++ b/.github/workflows/prepare-reth.yml
@@ -24,10 +24,9 @@ on:
 
 jobs:
   prepare-reth:
-    if: github.repository == 'paradigmxyz/reth'
+    if: github.repository == 'op-rs/op-reth'
     timeout-minutes: 45
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
       - run: mkdir artifacts
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
index 7225d84cffa..9dfa13b7b5f 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -22,8 +22,7 @@ jobs:
     name: stage-run-test
     # Only run stage commands test in merge groups
     if: github.event_name == 'merge_group'
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1
diff --git a/.github/workflows/sync-era.yml b/.github/workflows/sync-era.yml
index f2539b2fdc2..5da9a010941 100644
--- a/.github/workflows/sync-era.yml
+++ b/.github/workflows/sync-era.yml
@@ -17,8 +17,7 @@ concurrency:
 jobs:
   sync:
     name: sync (${{ matrix.chain.bin }})
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index e57082b83e7..cac00371811 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -17,8 +17,7 @@ concurrency:
 jobs:
   sync:
     name: sync (${{ matrix.chain.bin }})
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index d9aca93f21c..d7bb4639ab5 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -19,8 +19,7 @@ concurrency:
 jobs:
   test:
     name: test / ${{ matrix.type }} (${{ matrix.partition }}/${{ matrix.total_partitions }})
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     strategy:
@@ -65,8 +64,7 @@ jobs:
 
   state:
     name: Ethereum state tests
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_LOG: info,sync=error
       RUST_BACKTRACE: 1
@@ -100,8 +98,7 @@ jobs:
 
   doc:
     name: doc tests
-    runs-on:
-      group: Reth
+    runs-on: ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 30