diff --git a/.github/workflows/rust.yml b/.github/workflows/checks.yml
similarity index 90%
rename from .github/workflows/rust.yml
rename to .github/workflows/checks.yml
index f2cc5b8dd..4c7f8df01 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/checks.yml
@@ -1,4 +1,4 @@
-name: Rust
+name: Checks
 
 # On Rust, GitHub Actions, and caching
 # ===========
@@ -50,6 +50,8 @@ on:
 env:
   CARGO_TERM_COLOR: always
   RUSTFLAGS: -D warnings
+  FOUNDRY_PROFILE: ci
+
 
 # Automatically cancels a job if a new commit if pushed to the same PR, branch, or tag.
 # Source: <https://stackoverflow.com/a/72408109/5148606>
@@ -170,3 +172,32 @@ jobs:
         run: rustup show
       - name: Run nextest
         run: SKIP_GUEST_BUILD=1 make test
+
+  system-contracts:
+    strategy:
+      fail-fast: true
+
+    name: Foundry project
+    runs-on: ubicloud-standard-2
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Run Forge build
+        run: |
+          cd module-system/module-implementations/sov-evm/src/evm/system_contracts
+          forge --version
+          forge build --sizes
+        id: build
+
+      - name: Run Forge tests
+        run: |
+          cd module-system/module-implementations/sov-evm/src/evm/system_contracts
+          forge test -vvv
+        id: test
\ No newline at end of file
diff --git a/.github/workflows/foundry.yml b/.github/workflows/foundry.yml
deleted file mode 100644
index 2d877babc..000000000
--- a/.github/workflows/foundry.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: foundry
-
-on:
-  merge_group:
-    types: ["checks_requested"]
-  push:
-    branches: ["nightly", "stable"]
-  pull_request:
-    branches: ["nightly", "stable"]
-    types: [opened, synchronize, reopened, ready_for_review]
-
-env:
-  CARGO_TERM_COLOR: always
-  RUSTFLAGS: -D warnings
-  FOUNDRY_PROFILE: ci
-
-
-# Automatically cancels a job if a new commit if pushed to the same PR, branch, or tag.
-# Source: <https://stackoverflow.com/a/72408109/5148606>
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-foundry
-  # Except in `nightly` and `stable` branches! Any cancelled job will cause the
-  # CI run to fail, and we want to keep a clean history for major branches.
-  cancel-in-progress: ${{ (github.ref != 'refs/heads/nightly') && (github.ref != 'refs/heads/stable') }}
-
-jobs:
-  check:
-    strategy:
-      fail-fast: true
-
-    name: Foundry project
-    runs-on: ubicloud-standard-2
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
-
-      - name: Run Forge build
-        run: |
-          cd module-system/module-implementations/sov-evm/src/evm/system_contracts
-          forge --version
-          forge build --sizes
-        id: build
-
-      - name: Run Forge tests
-        run: |
-          cd module-system/module-implementations/sov-evm/src/evm/system_contracts
-          forge test -vvv
-        id: test