diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9282e82..a3f6eab 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,34 +1,15 @@
-name: test
-
-on: workflow_dispatch
-
-env:
-  FOUNDRY_PROFILE: ci
+name: CI
+on:
+  pull_request:
+  push:
+    branches:
+    - main
+  workflow_dispatch:
 
 jobs:
-  check:
-    strategy:
-      fail-fast: true
-
-    name: Foundry project
-    runs-on: ubuntu-latest
-    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: |
-          forge --version
-          forge build --sizes
-        id: build
-
-      - name: Run Forge tests
-        run: |
-          forge test -vvv
-        id: test
+  solidity-base:
+    uses: init4tech/actions/.github/workflows/solidity-base.yml@main
+    with:
+      gas-diff-tolerance: 2 # setting the gas diff tolerance to 2%
+  solidity-coverage:
+    uses: init4tech/actions/.github/workflows/solidity-coverage.yml@main