diff --git a/.github/workflows/smoke-codex.lock.yml b/.github/workflows/smoke-codex.lock.yml
index a3c8f2f16e..1347ff9a40 100644
--- a/.github/workflows/smoke-codex.lock.yml
+++ b/.github/workflows/smoke-codex.lock.yml
@@ -1047,7 +1047,9 @@ jobs:
           - ✅ or ❌ for each test result
           - Overall status: PASS or FAIL
           
-          If all tests pass, add the label `smoke-codex` to the pull request.
+          If all tests pass:
+          - Use the `add_labels` safe-output tool to add the label `smoke-codex` to the pull request
+          - Use the `remove_labels` safe-output tool to remove the label `smoke` from the pull request
           
           PROMPT_EOF
       - name: Substitute placeholders
diff --git a/.github/workflows/smoke-codex.md b/.github/workflows/smoke-codex.md
index b6c21ab088..2a48c21da4 100644
--- a/.github/workflows/smoke-codex.md
+++ b/.github/workflows/smoke-codex.md
@@ -81,4 +81,6 @@ Add a **very brief** comment (max 5-10 lines) to the current pull request with:
 - ✅ or ❌ for each test result
 - Overall status: PASS or FAIL
 
-If all tests pass, add the label `smoke-codex` to the pull request.
+If all tests pass:
+- Use the `add_labels` safe-output tool to add the label `smoke-codex` to the pull request
+- Use the `remove_labels` safe-output tool to remove the label `smoke` from the pull request
diff --git a/.github/workflows/smoke-copilot.lock.yml b/.github/workflows/smoke-copilot.lock.yml
index 69356f38d0..21b5868d02 100644
--- a/.github/workflows/smoke-copilot.lock.yml
+++ b/.github/workflows/smoke-copilot.lock.yml
@@ -966,8 +966,8 @@ jobs:
              - Mention the pull request author and any assignees
           
           If all tests pass:
-          - Add the label `smoke-copilot` to the pull request
-          - Remove the label `smoke` from the pull request
+          - Use the `add_labels` safe-output tool to add the label `smoke-copilot` to the pull request
+          - Use the `remove_labels` safe-output tool to remove the label `smoke` from the pull request
           
           PROMPT_EOF
       - name: Substitute placeholders
diff --git a/.github/workflows/smoke-copilot.md b/.github/workflows/smoke-copilot.md
index 07a2d35b82..34b82c9d6f 100644
--- a/.github/workflows/smoke-copilot.md
+++ b/.github/workflows/smoke-copilot.md
@@ -95,5 +95,5 @@ strict: true
    - Mention the pull request author and any assignees
 
 If all tests pass:
-- Add the label `smoke-copilot` to the pull request
-- Remove the label `smoke` from the pull request
+- Use the `add_labels` safe-output tool to add the label `smoke-copilot` to the pull request
+- Use the `remove_labels` safe-output tool to remove the label `smoke` from the pull request