diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a34267d42..a890a4a0c6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -76,9 +76,11 @@ jobs:
          python -m pip install coverage
          curl -Os https://cli.codecov.io/latest/linux/codecov
          chmod +x codecov
-      - name: Combine, convert and upload
+      - name: Generate coverage.py report
         run: |
          coverage combine ./coverage
          coverage xml
-         ./codecov --verbose upload-process --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} -n 'service'-${{ github.run_id }} -F service -f coverage.xml
-         ls -lha
+      - name: Upload to codecov
+        run: |
+         export CODECOV_NAME='service'-${{ github.event.number }}-${{ github.sha }}
+         ./codecov --verbose upload-process --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} -n $CODECOV_NAME -F service -f coverage.xml