diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a17182776..d99e7e113 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        profile: [post-osaka,post-osaka-via-ir,solc-past-versions-0,solc-past-versions-1,via-ir,min-solc,min-solc-via-ir,intense]
+        profile: [post-osaka,post-osaka-via-ir,solc-past-versions-0,solc-past-versions-1,solc-past-versions-2,via-ir,min-solc,min-solc-via-ir,intense]
     steps:
       - uses: actions/checkout@v5
       - name: Install Foundry Stable
@@ -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.35 &&
-            FOUNDRY_PROFILE=zksync forge test --use 0.8.35
+            FOUNDRY_PROFILE=post_osaka forge test --use 0.8.36 &&
+            FOUNDRY_PROFILE=zksync forge test --use 0.8.36
           ) ||
           ( [ "${{ matrix.profile }}" = "post-osaka-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
+            FOUNDRY_PROFILE=post_osaka forge test --use 0.8.36 --via-ir &&
+            FOUNDRY_PROFILE=zksync forge test --use 0.8.36 --via-ir
           ) ||
           ( [ "${{ matrix.profile }}" = "solc-past-versions-0" ] &&
             FOUNDRY_PROFILE=pre_global_structs forge test --use 0.8.5 --fuzz-runs 16 &&
@@ -64,11 +64,14 @@ jobs:
             forge test --use 0.8.26 --fuzz-runs 16 &&
             forge test --use 0.8.27 --fuzz-runs 16 &&
             forge test --use 0.8.28 --fuzz-runs 16 &&
-            forge test --use 0.8.29 --fuzz-runs 16 &&
+            forge test --use 0.8.29 --fuzz-runs 16
+          ) ||
+          ( [ "${{ matrix.profile }}" = "solc-past-versions-2" ] &&
             forge test --use 0.8.30 --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
+            forge test --use 0.8.34 --fuzz-runs 16 &&
+            forge test --use 0.8.35 --fuzz-runs 16
           ) ||
           ( [ "${{ matrix.profile }}" = "via-ir" ] &&
             forge test --via-ir
diff --git a/.github/workflows/gas-diff-comment.yml b/.github/workflows/gas-diff-comment.yml
index 8c81c4176..d621914b4 100644
--- a/.github/workflows/gas-diff-comment.yml
+++ b/.github/workflows/gas-diff-comment.yml
@@ -8,12 +8,17 @@ on:
 
 jobs:
   comment:
-    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
+    if: >-
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion != 'cancelled'
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
+      actions: read
     steps:
       - name: Download gas diff artifact
+        id: download
+        continue-on-error: true
         uses: actions/download-artifact@v8.0.1
         with:
           name: gas-diff
@@ -21,10 +26,12 @@ jobs:
           run-id: ${{ github.event.workflow_run.id }}
 
       - name: Read PR number
+        if: steps.download.outcome == 'success'
         id: pr
         run: echo "number=$(cat pr-number.txt)" >> "$GITHUB_OUTPUT"
 
       - name: Read gas diff
+        if: steps.download.outcome == 'success'
         id: gas_diff
         run: |
           if [ -f comment.md ] && [ -s comment.md ]; then
@@ -36,6 +43,7 @@ jobs:
           fi
 
       - name: Add gas diff to sticky comment
+        if: steps.download.outcome == 'success'
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           number: ${{ steps.pr.outputs.number }}
diff --git a/foundry.toml b/foundry.toml
index b155ea4f1..379a79891 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -4,7 +4,7 @@
 
 # The Default Profile
 [profile.default]
-solc_version = "0.8.35"
+solc_version = "0.8.36"
 evm_version = "paris" # osaka will be tested in the CI.
 auto_detect_solc = false
 optimizer = true