diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78b14fb58..4e73cc807 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Install Foundry Stable
-        uses: foundry-rs/foundry-toolchain@v1
+        uses: foundry-rs/foundry-toolchain@v1.8.0
         with:
           version: stable
       - name: Install Dependencies
@@ -30,12 +30,12 @@ jobs:
       - name: Run Tests with ${{ matrix.profile }}
         run: >
           ( [ "${{ matrix.profile }}" = "post-osaka" ] &&
-            FOUNDRY_PROFILE=post_osaka forge test --use 0.8.33 &&
-            FOUNDRY_PROFILE=zksync forge test --use 0.8.33
+            FOUNDRY_PROFILE=post_osaka forge test --use 0.8.35 &&
+            FOUNDRY_PROFILE=zksync forge test --use 0.8.35
           ) ||
           ( [ "${{ matrix.profile }}" = "post-osaka-via-ir" ] &&
-            FOUNDRY_PROFILE=post_osaka forge test --use 0.8.33 --via-ir &&
-            FOUNDRY_PROFILE=zksync forge test --use 0.8.33 --via-ir
+            FOUNDRY_PROFILE=post_osaka forge test --use 0.8.35 --via-ir &&
+            FOUNDRY_PROFILE=zksync forge test --use 0.8.35 --via-ir
           ) ||
           ( [ "${{ matrix.profile }}" = "solc-past-versions-0" ] &&
             FOUNDRY_PROFILE=pre_global_structs forge test --use 0.8.5 --fuzz-runs 16 &&
@@ -66,7 +66,9 @@ jobs:
             forge test --use 0.8.28 --fuzz-runs 16 &&
             forge test --use 0.8.29 --fuzz-runs 16 &&
             forge test --use 0.8.30 --fuzz-runs 16 &&
-            forge test --use 0.8.31 --fuzz-runs 16
+            forge test --use 0.8.31 --fuzz-runs 16 &&
+            forge test --use 0.8.33 --fuzz-runs 16 &&
+            forge test --use 0.8.34 --fuzz-runs 16
           ) ||
           ( [ "${{ matrix.profile }}" = "via-ir" ] &&
             forge test --via-ir
@@ -90,7 +92,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Install Foundry Stable
-        uses: foundry-rs/foundry-toolchain@v1
+        uses: foundry-rs/foundry-toolchain@v1.8.0
         with:
           version: stable
       - name: Install Dependencies
@@ -131,13 +133,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v5
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+        uses: foundry-rs/foundry-toolchain@v1.8.0
         with:
           version: stable
       - name: Install Dependencies
         run: forge install
       - name: Generate gas diff
-        uses: atarpara/foundry-snapshot-diff@v0.8
+        uses: atarpara/foundry-snapshot-diff@v0.9
+        with:
+          foundry-profile: "profile.post_osaka"
         id: gas_diff
       - name: Save gas diff output
         if: steps.gas_diff.outputs.markdown
@@ -163,7 +167,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v5
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+        uses: foundry-rs/foundry-toolchain@v1.8.0
         with:
           version: stable
       - name: Install Dependencies
diff --git a/foundry.toml b/foundry.toml
index e502cbe48..a1ff5acf9 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -4,13 +4,13 @@
 
 # The Default Profile
 [profile.default]
-solc_version = "0.8.33"
+solc_version = "0.8.35"
 evm_version = "paris" # osaka will be tested in the CI.
 auto_detect_solc = false
 optimizer = true
 optimizer_runs = 1_000
-gas_limit = 100_000_000 # ETH is 30M, but we use a higher value.
-skip = ["*/*7702*", "*/*BlockHashLib*", "*/*Transient*", "*/ext/ithaca/*", "*/ext/zksync/*"]
+gas_limit = 100_000_000 # ETH is 60M, but we use a higher value.
+skip = ["*/*7702*", "*/*BlockHashLib*", "*/*Transient*", "*/ext/ithaca/*", "*/clz/*" ,"*/ext/zksync/*"]
 fs_permissions = [{ access = "read", path = "./test/data"}]
 remappings = [
   "forge-std=test/utils/forge-std/"