diff --git a/.github/workflows/test-runner-ci.yaml b/.github/workflows/test-runner-ci.yaml
index a0a80ddd9..b8e9ae4e4 100644
--- a/.github/workflows/test-runner-ci.yaml
+++ b/.github/workflows/test-runner-ci.yaml
@@ -78,21 +78,18 @@ jobs:
     - name: Coverage
       run: |
         python -m pip install coverage
-        python -m coverage combine
-        echo -e "\`\`\`markdown\n$(python -m coverage report -i -m)\n\`\`\`" >> $GITHUB_STEP_SUMMARY
-        echo "total=$(python -m coverage report --format=total)" >> $GITHUB_ENV
-    - name: Update Badge
-      if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
-      uses: schneegans/dynamic-badges-action@v1.7.0
+        python -m coverage combine --debug=pathmap
+        python -m coverage xml --skip-empty
+    - name: Comment on PR
+      uses: orgoro/coverage@v3.1
       with:
-        auth: ${{ secrets.ACTIONS_TOKEN }}
-        gistID: 48dea0fc9a908a6e5ba5c5e84123bc02
-        filename: coverage.json
-        label: Coverage
-        message: ${{ env.total }}%
-        minColorRange: 40
-        maxColorRange: 80
-        valColorRange: ${{ env.total }}
+        coverageFile: coverage.xml
+        token: ${{ secrets.ACTION_TOKEN }}
+        treshholdAll: 80
+    - uses: actions/upload-artifact@v4
+      with:
+        name: coverage.xml
+        path: coverage.xml
   integration-test:
     runs-on: k8-runners
     steps:
diff --git a/README.md b/README.md
index 66e5a46aa..7bf2a244d 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@
 [![Test Runner CI](https://github.com/intel/ai-containers/actions/workflows/test-runner-ci.yaml/badge.svg)](https://github.com/intel/ai-containers/actions/workflows/test-runner-ci.yaml)
 [![Weekly Tests](https://github.com/intel/ai-containers/actions/workflows/weekly-test.yaml/badge.svg)](https://github.com/intel/ai-containers/actions/workflows/weekly-test.yaml)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/intel/ai-containers/main.svg)](https://results.pre-commit.ci/latest/github/intel/ai-containers/main)
-[![coverage](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/tylertitsworth/48dea0fc9a908a6e5ba5c5e84123bc02/raw/coverage.json)](https://gist.github.com/tylertitsworth/48dea0fc9a908a6e5ba5c5e84123bc02)
 
 This repository contains Dockerfiles, scripts, yaml files, Helm charts, etc. used to scale out AI containers with versions of TensorFlow and PyTorch that have been optimized for Intel platforms. Scaling is done with python, Docker, kubernetes, kubeflow, cnvrg.io, Helm, and other container orchestration frameworks for use in the cloud and on-premise.
 
diff --git a/tox.ini b/tox.ini
index 27ce87a9b..0a744034f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,8 @@
 env_list =
     py{38,39,310,311,312}
     coverage
+source =
+    test-runner/*
 
 [testenv]
 deps =
@@ -35,6 +37,9 @@ exclude_lines =
     if __name__ == "__main__":
 omit = utest.py
 
+[coverage:combine]
+relative_paths = true
+
 [gh-actions]
 python =
     3.8: py38