diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 3fc40d3f..53f4aa5a 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,23 +6,28 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Check mopro-core formatting
+        run: cd ark-zkey/ && cargo fmt --all -- --check
+      - name: Check mopro-core formatting
+        run: cd mopro-core/ && cargo fmt --all -- --check
+      - name: Check mopro-ffi formatting
+        run: cd mopro-ffi/ && cargo fmt --all -- --check
+
   setup:
-    runs-on: macos-latest
-    outputs:
-      cache-key: ${{ steps.cache-key.outputs.key }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v3
-      - name: Install circom
-        run: |
-          git clone https://github.com/iden3/circom.git
-          cd circom
-          cargo build --release
-          cargo install --path circom
       - name: Prepare CI
         run: ./scripts/prepare_ci.sh
       - name: Generate cache key
-        id: cache-key
-        run: echo "::set-output name=key::$(date +%s)"
+        run: echo "cache-key-$(date +%s)"
 
   build-ios:
     needs: setup
@@ -61,16 +66,4 @@ jobs:
         if: matrix.test-suite == 'ios'
         run: |
           cd mopro-ios/MoproKit/Example
-          xcodebuild test -scheme MoproKit-Example -workspace MoproKit.xcworkspace -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14 Pro"
-
-  lint:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Check mopro-core formatting
-        run: cd ark-zkey/ && cargo fmt --all -- --check
-      - name: Check mopro-core formatting
-        run: cd mopro-core/ && cargo fmt --all -- --check
-      - name: Check mopro-ffi formatting
-        run: cd mopro-ffi/ && cargo fmt --all -- --check
\ No newline at end of file
+          xcodebuild test -scheme MoproKit-Example -workspace MoproKit.xcworkspace -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14 Pro"
\ No newline at end of file