diff --git a/.github/actions/install-cli/action.yml b/.github/actions/install-cli/action.yml
index b14e28c341f..fa6ef273ed1 100644
--- a/.github/actions/install-cli/action.yml
+++ b/.github/actions/install-cli/action.yml
@@ -19,6 +19,10 @@ runs:
       with:
         ref: ${{ inputs.ref }}
 
+    - name: Setup Foundry
+      if: inputs.no-cache != 'false'
+      uses: ./.github/actions/setup-foundry
+
     - name: yarn-install-build-without-cache
       if: inputs.no-cache != 'false'
       shell: bash
diff --git a/.github/workflows/bytecode-analysis.yml b/.github/workflows/bytecode-analysis.yml
index 8b940b91a71..c9034120214 100644
--- a/.github/workflows/bytecode-analysis.yml
+++ b/.github/workflows/bytecode-analysis.yml
@@ -2,8 +2,6 @@ name: Check Bytecode Changes
 
 on:
   pull_request:
-    branches:
-      - '*'
     paths:
       - 'solidity/**'
       - '.github/workflows/bytecode-analysis.yml'
@@ -17,7 +15,8 @@ on:
 jobs:
   diff-check:
     runs-on: ubuntu-latest
-
+    # Skip on changeset version PRs, as bytecode is expected to change with package version bumps
+    if: github.head_ref != 'changeset-release/main'
     steps:
       # Checkout the PR branch
       - name: Checkout PR branch
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0b46e1add53..901a866e204 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -152,6 +152,7 @@ jobs:
   # This job publishes the release to NPM.
   publish-release:
     needs: cli-install-cross-platform-release-test
+    if: github.ref == 'refs/heads/main'
     permissions:
       id-token: write
       contents: write
@@ -180,6 +181,9 @@ jobs:
         with:
           node-version-file: .nvmrc
 
+      - name: Setup Foundry
+        uses: ./.github/actions/setup-foundry
+
       - name: Install Dependencies
         run: yarn install --immutable