diff --git a/.codeclimate.yml b/.codeclimate.yml
index 54a1f0e3dd..c3872f4cf7 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,3 +1,4 @@
+version: "2"
 exclude_patterns:
   - ".github"
   - "extern/mbed-os"
diff --git a/.github/workflows/ci-unit_test.yml b/.github/workflows/ci-unit_test.yml
index ea2d9496af..4260edfa6e 100644
--- a/.github/workflows/ci-unit_test.yml
+++ b/.github/workflows/ci-unit_test.yml
@@ -56,12 +56,21 @@ jobs:
         run: |
           make ut
 
-      - name: Generate code coverage
+      - name: Generate lcov code coverage
+        run: |
+          make coverage_lcov
+
+      - name: Upload Codeclimate code coverage
         uses: paambaati/codeclimate-action@v2.7.5
         env:
-          CC_TEST_REPORTER_ID: 8de9444a64780871f476dc71b6ef5ed0406880cc6803680982ceefb84dc96633
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         with:
           debug: true
           prefix: ${{github.workspace}}
-          coverageCommand: make coverage_lcov
           coverageLocations: ${{github.workspace}}/_build_unit_tests/_coverage/coverage.info:lcov
+
+      - name: Upload Codecov code coverage
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        run: |
+          bash <(curl -s https://codecov.io/bash) -f ${{github.workspace}}/_build_unit_tests/_coverage/coverage.info || echo "Codecov did not collect coverage reports"
diff --git a/Makefile b/Makefile
index 97d3e48c52..cb78784978 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,8 @@ coverage_lcov:
 	@echo "🔬 Generating code coverage using lcov 📝"
 	@mkdir -p $(UNIT_TESTS_COVERAGE_DIR)
 	@lcov --capture --directory . --output-file $(UNIT_TESTS_COVERAGE_DIR)/_tmp_coverage.info
-	@lcov --remove $(UNIT_TESTS_COVERAGE_DIR)/_tmp_coverage.info '*googletest*' '*v1*' '*Xcode*' '*CommandLineTools*' '*tests/unit*' -o $(UNIT_TESTS_COVERAGE_DIR)/coverage.info
+	@lcov --remove $(UNIT_TESTS_COVERAGE_DIR)/_tmp_coverage.info '/usr/*' '*extern*' '*googletest*' '*v1*' '*Xcode*' '*CommandLineTools*' '*tests/unit*' -o $(UNIT_TESTS_COVERAGE_DIR)/coverage.info
+	@lcov --list $(UNIT_TESTS_COVERAGE_DIR)/coverage.info
 
 view_coverage:
 	@echo ""