diff --git a/.github/workflows/certora.yml b/.github/workflows/certora.yml
index c19a0bf4a..fd4e16a3a 100644
--- a/.github/workflows/certora.yml
+++ b/.github/workflows/certora.yml
@@ -29,7 +29,7 @@ jobs:
               with: { java-version: "17", java-package: jre, distribution: semeru }
 
             - name: Install certora cli
-              run: pip install -Iv certora-cli
+              run: pip install -Iv certora-cli==4.13.1
 
             - name: Install solc
               run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f9b5e6d8..6f4d51ee1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,27 +29,11 @@ jobs:
             - run: npm run lint:ts
 
     tests:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-node@v2
-              with:
-                  node-version: ${{ env.NODE_VERSION }}
-                  cache: "npm"
-            - run: npm ci
-            - run: npm run build
-            - run: SAFE_CONTRACT_UNDER_TEST=SafeL2 npm run coverage
-            - name: Coveralls
-              uses: coverallsapp/github-action@master
-              with:
-                  github-token: ${{ secrets.GITHUB_TOKEN }}
-
-    tests-other:
         runs-on: ubuntu-latest
         strategy:
             fail-fast: false
             matrix:
-                contract-name: ["SafeL2"]
+                contract-name: ["Safe", "SafeL2"]
         env:
             SAFE_CONTRACT_UNDER_TEST: ${{ matrix.contract-name }}
         steps:
@@ -61,10 +45,24 @@ jobs:
             - run: npm ci
             - run: npm run build
             - run: npm run coverage
-            - name: Coveralls
-              uses: coverallsapp/github-action@master
+            - name: Send coverage to Coveralls (parallel)
+              uses: coverallsapp/github-action@v2
               with:
+                  parallel: true
+                  flag-name: run-$
                   github-token: ${{ secrets.GITHUB_TOKEN }}
+
+    finish:
+        runs-on: ubuntu-latest
+        needs: tests
+        if: ${{ always() }}
+        steps:
+            - name: Coveralls Finished
+              uses: coverallsapp/github-action@v2
+              with:
+                  parallel-finished: true
+                  carryforward: "run-Safe,run-SafeL2"
+
     benchmarks:
         runs-on: ubuntu-latest
         strategy: