diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml
index 470316c9b..0424e72ca 100644
--- a/.github/workflows/arbitrator-ci.yml
+++ b/.github/workflows/arbitrator-ci.yml
@@ -28,7 +28,7 @@ env:
 jobs:
   arbitrator:
     name: Run Arbitrator tests
-    runs-on: linux-xl
+    runs-on: linux-2xl
     steps:
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
diff --git a/.github/workflows/arbitrator-skip-ci.yml b/.github/workflows/arbitrator-skip-ci.yml
index a9ba879d3..3e8e2e3fa 100644
--- a/.github/workflows/arbitrator-skip-ci.yml
+++ b/.github/workflows/arbitrator-skip-ci.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   arbitrator:
     name: Run Arbitrator tests
-    runs-on: linux-xl
+    runs-on: linux-2xl
     steps:
       - name: Do nothing
         run: echo "doing nothing"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b3a0ad98..b0ebd8852 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   test:
     name: Go Tests
-    runs-on: linux-xl
+    runs-on: linux-2xl
 
     # Creates a redis container for redis tests
     services:
@@ -67,15 +67,17 @@ jobs:
         id: install-rust-nightly
         with:
           profile: minimal
-          toolchain: "nightly"
-
+          toolchain: "nightly-2024-07-30"
+      
       - name: Install rust wasm targets
         run: rustup target add wasm32-wasi wasm32-unknown-unknown
 
       - name: Install nightly wasm targets
         run: |
-          rustup component add rust-src --toolchain nightly
-          rustup target add wasm32-unknown-unknown --toolchain nightly
+          nightly_toolchain='nightly-2024-07-30'
+          echo 'STYLUS_NIGHTLY_VER=+'"$nightly_toolchain" >> "$GITHUB_ENV"
+          rustup component add rust-src --toolchain "$nightly_toolchain"
+          rustup target add wasm32-unknown-unknown --toolchain "$nightly_toolchain"
 
       - name: Cache Build Products
         uses: actions/cache@v3
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b5d236636..d35b77ee3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ jobs:
   analyze:
     name: Analyze
     if: github.repository == 'Layr-Labs/nitro' # don't run in any forks without "Advanced Security" enabled
-    runs-on: linux-xl
+    runs-on: linux-2xl
     permissions:
       actions: read
       contents: read
diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml
index 8ecf623ed..00d1b99be 100644
--- a/.github/workflows/docker-eigenda.yml
+++ b/.github/workflows/docker-eigenda.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   docker:
-    runs-on: linux-xl
+    runs-on: linux-2xl
     strategy:
       matrix:
         include:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5178d95a2..a01d288be 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   docker:
     name: Docker build
-    runs-on: linux-xl
+    runs-on: linux-2xl
     services:
       # local registery
       registry:
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
index 1b76c3f5f..46da3664c 100644
--- a/.github/workflows/release-ci.yml
+++ b/.github/workflows/release-ci.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build_and_run:
-    runs-on: linux-xl
+    runs-on: linux-2xl
 
     steps:
     - name: Checkout