diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 747bb8ef..abd1d1de 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -33,7 +33,7 @@ jobs:
         run: |
           aws s3 sync \
             middleware/coverage/ \
-            s3://${{ secrets.CODECOVERAGE_S3_BUCKET }}/middleware_coverage_report \
+            s3://${{ secrets.CODECOVERAGE_S3_BUCKET }}/powhsm_4.1.x/middleware_coverage_report \
             --sse aws:kms --sse-kms-key-id ${{ secrets.CODECOVERAGE_KMS_KEY_ID }} \
             --no-progress --follow-symlinks --delete --only-show-errors
 
@@ -48,7 +48,7 @@ jobs:
         run: |
           aws s3 sync \
             ledger/coverage/output/ \
-            s3://${{ secrets.CODECOVERAGE_S3_BUCKET }}/firmware_coverage_report \
+            s3://${{ secrets.CODECOVERAGE_S3_BUCKET }}/powhsm_4.1.x/firmware_coverage_report \
             --sse aws:kms --sse-kms-key-id ${{ secrets.CODECOVERAGE_KMS_KEY_ID }} \
             --no-progress --follow-symlinks --delete --only-show-errors
 
diff --git a/README.md b/README.md
index f77da9ac..11933a13 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
 ![Tests](https://github.com/rsksmart/rsk-powhsm/actions/workflows/run-tests.yml/badge.svg)
 ![Python linter](https://github.com/rsksmart/rsk-powhsm/actions/workflows/lint-python.yml/badge.svg)
 ![C linter](https://github.com/rsksmart/rsk-powhsm/actions/workflows/lint-c.yml/badge.svg)
-![Middleware coverage](https://img.shields.io/endpoint?url=https://d16sboe9lzo4ru.cloudfront.net/middleware_coverage_report/badge.json)
-![Firmware coverage](https://img.shields.io/endpoint?url=https://d16sboe9lzo4ru.cloudfront.net/firmware_coverage_report/badge.json)
+[![Middleware coverage](https://img.shields.io/endpoint?url=https://d16sboe9lzo4ru.cloudfront.net/powhsm_4.1.x/middleware_coverage_report/badge.json)](https://d16sboe9lzo4ru.cloudfront.net/powhsm_4.1.x/middleware_coverage_report/index.html)
+[![Firmware coverage](https://img.shields.io/endpoint?url=https://d16sboe9lzo4ru.cloudfront.net/powhsm_4.1.x/firmware_coverage_report/badge.json)](https://d16sboe9lzo4ru.cloudfront.net/powhsm_4.1.x/firmware_coverage_report/index.html)
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](./LICENSE)
 
diff --git a/ledger/coverage/gen-coverage b/ledger/coverage/gen-coverage
index 84756f84..db4d2f63 100755
--- a/ledger/coverage/gen-coverage
+++ b/ledger/coverage/gen-coverage
@@ -25,7 +25,7 @@ if [[ $1 == "exec" ]]; then
     popd > /dev/null
 
     lcov --capture --directory $SRCDIR --list-full-path --output-file $BASEDIR/coverage.info
-    genhtml $BASEDIR/coverage.info --output $BASEDIR/output -p $SRCDIR
+    genhtml $BASEDIR/coverage.info --output $BASEDIR/output -p $SRCDIR -t "powHSM firmware"
     lcov --summary $BASEDIR/coverage.info | grep lines | sed -e "s/.\+lines.\+: \([[:digit:].]\+\).\+/\1/g" > $BASEDIR/output/total
     mv $BASEDIR/coverage.info $BASEDIR/output
 else
diff --git a/middleware/test-all-coverage b/middleware/test-all-coverage
index ade247ed..1b753537 100755
--- a/middleware/test-all-coverage
+++ b/middleware/test-all-coverage
@@ -10,7 +10,7 @@ if [[ $1 == "exec" ]]; then
     rm -rf coverage
     coverage erase
     coverage run -m unittest discover
-    coverage html -d coverage
+    coverage html -d coverage --title="powHSM middleware"
     coverage report --format=total > coverage/total
     echo "Wrote total to coverage/total"
     coverage erase