diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml
index 84913a1cd3..dabfa417f4 100644
--- a/.github/workflows/orquesta-integration-tests.yaml
+++ b/.github/workflows/orquesta-integration-tests.yaml
@@ -106,7 +106,7 @@ jobs:
 
     env:
       TASK: '${{ matrix.task }}'
-
+      PYTHON_VERSION_SHORT: '${{ matrix.python-version-short }}'
       NODE_TOTAL: '${{ matrix.nosetests_node_total }}'
       NODE_INDEX: '${{ matrix.nosetests_node_index }}'
 
@@ -226,9 +226,11 @@ jobs:
           path: logs/
       - name: Codecov
         # NOTE: We only generate and submit coverage report for master and version branches and only when the build succeeds (default on GitHub Actions, this was not the case on Travis so we had to explicitly check success)
-        if: "${{ success() && env.ENABLE_COVERAGE == 'yes' }}"
+        if: "${{ success() && (env.ENABLE_COVERAGE == 'yes') && (env.PYTHON_VERSION_SHORT == '3.8')}}"
         run: |
           ./scripts/ci/submit-codecov-coverage.sh
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       - name: Compress Service Logs Before upload
         if: ${{ failure() }}
         run: |
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d9efe84527..36b5f82e86 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -18,7 +18,7 @@ Fixed
 
 * Avoid logging sensitive information in debug (fix #5977)
 
-* Fix codecov stackstorm/st2 (https://github.com/StackStorm/st2/issues/6035)
+* Fix codecov for intergration and unit tests stackstorm/st2 (#6035 and #6046)
 
 Added
 ~~~~~
diff --git a/scripts/ci/submit-codecov-coverage.sh b/scripts/ci/submit-codecov-coverage.sh
index 416e5533ae..76ab0f362c 100755
--- a/scripts/ci/submit-codecov-coverage.sh
+++ b/scripts/ci/submit-codecov-coverage.sh
@@ -21,7 +21,7 @@ if [[ "${USER}" == "runner" || ${TRAVIS_TEST_RESULT} -eq 0 ]]; then
     # 1. Install codecov dependencies
     pip install -U pip
     pip install coverage
-    pip install codecov-cli>=0.3.2
+    pip install 'codecov-cli>=0.4'
 
     # 2. Combine coverage report and submit coverage report to codecov.io
     codecovcli upload-process -t "${CODECOV_TOKEN}"