diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5fa53942e7..8e672e0318 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -593,11 +593,11 @@ jobs:
                 text:
                   type: mrkdwn
                   text: |
-                    ${{ needs.setup.result != 'failure' && ':white_check_mark:' || ':x:' }} Setup
-                    ${{ needs.ui.result != 'failure' && ':white_check_mark:' || ':x:' }} Build UI
-                    ${{ (needs.artifacts-ent.result != 'failure' && needs.artifacts-ce.result != 'failure') && ':white_check_mark:' || ':x:' }} Build Vault Artifacts
-                    ${{ needs.test.result != 'failure' && ':white_check_mark:' || ':x:' }} Enos package test scenarios
-                    ${{ needs.test-containers.result != 'failure' && ':white_check_mark:' || ':x:' }} Enos container test scenarios
+                    ${{ needs.setup.result           == 'failure' && ':x: Setup'                         || '' }}
+                    ${{ needs.ui.result              == 'failure' && ':x: Build UI'                      || '' }}
+                    ${{ needs.test.result            == 'failure' && ':x: Enos package test scenarios'   || '' }}
+                    ${{ needs.test-containers.result == 'failure' && ':x: Enos container test scenarios' || '' }}
+                    ${{ (needs.artifacts-ent.result == 'failure' || needs.artifacts-ce.result == 'failure') && ':x: Build Vault Artifacts' || '' }}
                 accessory:
                   type: button
                   text:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b9bbbb67f..760eed2feb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -436,6 +436,8 @@ jobs:
           always() &&
           needs.setup.outputs.workflow-trigger == 'push' &&
           (
+            needs.setup.result == 'failure' ||
+            needs.test-autopilot-upgrade.result == 'failure' ||
             needs.test-go.result == 'failure' ||
             needs.test-go-race.result == 'failure' ||
             needs.test-go-race.outputs.data-race-result == 'failure' ||
@@ -462,11 +464,18 @@ jobs:
                 text:
                   type: mrkdwn
                   text: |
-                    ${{ needs.test-go.result != 'failure' && ':white_check_mark:' || ':x:' }} Go tests
-                    ${{ needs.test-go-race.result != 'failure' && ':white_check_mark:' || ':x:' }} Go race tests
-                        ${{ needs.test-go-race.outputs.data-race-result != 'success' && ':x: Data race detected' || ':white_check_mark: No race detected' }}
-                    ${{ needs.test-go-testonly.result != 'failure' && ':white_check_mark:' || ':x:' }} Go testonly tests
-                    ${{ needs.test-ui.result != 'failure' && ':white_check_mark:' || ':x:' }} UI tests
+                    ${{ needs.setup.result                  == 'failure' && ':x: Setup'             || '' }}
+                    ${{ needs.test-autopilot-upgrade.result == 'failure' && ':x: Autopilot upgrade' || '' }}
+                    ${{ needs.test-go.result                == 'failure' && ':x: Go tests'          || '' }}
+                    ${{ needs.test-go-testonly.result       == 'failure' && ':x: Go testonly tests' || '' }}
+                    ${{ needs.test-go-fips.result           == 'failure' && ':x: Go FIPS tests'     || '' }}
+                    ${{ needs.test-ui.result                == 'failure' && ':x: UI tests'          || '' }}
+                    ${{ needs.test-go-race.result != 'skipped' &&
+                      (
+                        ((needs.test-go-race.outputs.data-race-result != '' && needs.test-go-race.outputs.data-race-result != 'success') && ':x: Go race tests (Data race(s) detected)') ||
+                        (needs.test-go-race.result == 'failure' && ':x: Go race tests' || '')
+                      ) || ''
+                    }}
                 accessory:
                   type: button
                   text: