diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
index 5e49a590be5e..5fcfc149b6f6 100644
--- a/.buildkite/heartbeat/heartbeat-pipeline.yml
+++ b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -20,7 +20,7 @@ steps:
           - ".buildkite/heartbeat/scripts/unit-tests.sh"
         notify:
           - github_commit_status:
-              context: "heartbeat/Unit Tests {{matrix.image}}"
+              context: "heartbeat/ linux/Unit Tests"
         agents:
           provider: "gcp"
           image: "{{matrix.image}}"
@@ -38,7 +38,7 @@ steps:
           - ".buildkite/heartbeat/scripts/unit-tests-win.ps1"
         notify:
           - github_commit_status:
-              context: "heartbeat/windows/Unit Tests {{matrix.image}}"
+              context: "heartbeat/ windows/Unit Tests"
         agents:
           provider: "gcp"
           image: "{{matrix.image}}"