diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4755d78..a191001 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,27 +1,40 @@
-name: CI
+name: Lint and test
 
 on:
-  workflow_dispatch:
+  pull_request:
+    branches:
+    - main
   push:
     branches:
-      - main
-  pull_request:
-permissions: read-all
+    - main
 
 jobs:
-  check:
+  lin:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: software-mansion/setup-scarb@v1
-      - name: Check cairo format
-        run: scarb fmt --check
-
+    - uses: actions/checkout@v3
+    - name: Extract scarb version
+      run: |
+        SCARB_VERSION=$(grep 'scarb-version = ' Scarb.toml | sed 's/scarb-version = "\(.*\)"/\1/')
+        echo "SCARB_VERSION=$SCARB_VERSION" >> $GITHUB_ENV
+    - uses: software-mansion/setup-scarb@v1
+      with:
+        scarb-version: ${{ env.SCARB_VERSION }}
+    - name: Cairo lint
+      run: scarb fmt --check
+  
   test:
+    name: Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: software-mansion/setup-scarb@v1
-      - uses: foundry-rs/setup-snfoundry@v3
-      - name: Test cairo contract
-        run: scarb test
\ No newline at end of file
+    - uses: actions/checkout@v3
+    - name: Extract scarb version
+      run: |
+        SCARB_VERSION=$(grep 'scarb-version = ' Scarb.toml | sed 's/scarb-version = "\(.*\)"/\1/')
+        echo "SCARB_VERSION=$SCARB_VERSION" >> $GITHUB_ENV
+    - uses: software-mansion/setup-scarb@v1
+      with:
+        scarb-version: ${{ env.SCARB_VERSION }}
+    - name: Cairo test
+      run: scarb test
\ No newline at end of file