diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index 97d5ff92f0..f3e87b533c 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -18,21 +18,32 @@ jobs:
     strategy:
       matrix:
         node-version: [18.x]
+
     steps:
       - uses: actions/checkout@v2
+
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
+
       - name: Install
         run: npm clean-install
+
       - name: Build
         run: npm run build
+
       - name: Test
         run: npm run test -- --coverage --watchAll=false
-      - name: Code coverage (PR to main or push to main)
-        if: ${{ github.ref == 'refs/heads/main' }} || ${{ github.base_ref == 'refs/heads/main'}}
+
+      - name: Upload to codecov (client)
+        uses: codecov/codecov-action@v1
+        with:
+          flags: client
+          directory: ./*/coverage
+
+      - name: Upload to codecov (server)
         uses: codecov/codecov-action@v1
         with:
-          flags: unitests
+          flags: server
           directory: ./*/coverage
diff --git a/codecov.yml b/codecov.yml
index 1d4847ec91..0186a5483b 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,19 +1,24 @@
 coverage:
   status:
     project:
-      default:
-        target: 75%
-      unitests:
-        target: 30%
+      default: false
+
+      client:
+        informational: true
+        target: auto
         flags:
-          - unitests
-      e2etests:
-        target: 70%
+          - client
+
+      server:
+        informational: true
+        target: auto
         flags:
-          - e2etests
+          - server
 
 flags:
-  unitests:
-    carryforward: false
-  e2etests:
-    carryforward: false
+  client:
+    paths:
+      - client/
+  server:
+    paths:
+      - server/