diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b300121d74..f3d6094062 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -65,6 +65,7 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: false
           verbose: true
+          flags: unit-tests
 
   build:
     runs-on: ubuntu-latest
@@ -161,6 +162,7 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: false
           verbose: true
+          flags: e2e-tests
 
   # Included as a single job to check for cypress-test-matrix success, as a matrix cannot be checked.
   cypress-tests:
diff --git a/codecov.yml b/codecov.yml
index c2333c2778..7482a5af89 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -9,13 +9,17 @@ ignore:
   - "**/constants/**/*"
   - "constants/**/*"
 
-coverage:
-  status:
-    project:
-      default:
+flag_management:
+  default_rules:
+    statuses:
+      - type: project
         target: auto
         threshold: 1%
         if_ci_failed: error
-    patch:
-      default:
-        target: 80%
\ No newline at end of file
+      - type: patch
+        target: 80%
+  individual_flags:
+    - name: e2e-tests
+      statuses:
+        - type: patch
+          target: 0%