diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3f47af055adb65..551c9861bd938d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -727,6 +727,7 @@ jobs:
         uses: codecov/codecov-action@v2.1.0
         with:
           files: coverage.xml
+          flags: full-suite
       - name: Upload coverage to Codecov (partial coverage)
         if: needs.changes.outputs.test_full_suite == 'false'
         uses: codecov/codecov-action@v2.1.0
diff --git a/codecov.yml b/codecov.yml
index 5c0750e659f390..8dee6ee368612b 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -12,4 +12,9 @@ comment: false
 # we need to carry forward.
 flag_management:
   default_rules:
-    carryforward: true
+    carryforward: false
+  individual_flags:
+    - name: full-suite
+      paths:
+        - ".*"
+      carryforward: true