diff --git a/actions/setup/js/add_comment.cjs b/actions/setup/js/add_comment.cjs
index d3a22f51d3..4e2a0f6ca2 100644
--- a/actions/setup/js/add_comment.cjs
+++ b/actions/setup/js/add_comment.cjs
@@ -302,7 +302,7 @@ async function main(config = {}) {
   const createdComments = [];
 
   // Get workflow ID for hiding older comments
-  const workflowId = process.env.GITHUB_WORKFLOW || "";
+  const workflowId = process.env.GH_AW_WORKFLOW_ID || "";
 
   /**
    * Message handler function
diff --git a/actions/setup/js/add_comment.test.cjs b/actions/setup/js/add_comment.test.cjs
index 360dba456e..d2bc6ea73a 100644
--- a/actions/setup/js/add_comment.test.cjs
+++ b/actions/setup/js/add_comment.test.cjs
@@ -398,7 +398,7 @@ describe("add_comment", () => {
       process.env.GH_AW_SAFE_OUTPUT_MESSAGES = JSON.stringify({
         appendOnlyComments: true,
       });
-      process.env.GITHUB_WORKFLOW = "test-workflow";
+      process.env.GH_AW_WORKFLOW_ID = "test-workflow";
 
       let hideCommentsWasCalled = false;
       let listCommentsCalls = 0;
@@ -458,7 +458,7 @@ describe("add_comment", () => {
 
       // Clean up
       delete process.env.GH_AW_SAFE_OUTPUT_MESSAGES;
-      delete process.env.GITHUB_WORKFLOW;
+      delete process.env.GH_AW_WORKFLOW_ID;
     });
 
     it("should hide older comments when append-only-comments is not enabled", async () => {
@@ -466,7 +466,7 @@ describe("add_comment", () => {
 
       // Set up environment variable WITHOUT append-only-comments
       delete process.env.GH_AW_SAFE_OUTPUT_MESSAGES;
-      process.env.GITHUB_WORKFLOW = "test-workflow";
+      process.env.GH_AW_WORKFLOW_ID = "test-workflow";
 
       let hideCommentsWasCalled = false;
       let listCommentsCalls = 0;
@@ -525,7 +525,7 @@ describe("add_comment", () => {
       expect(capturedComment.body).toContain("New comment - should hide old ones");
 
       // Clean up
-      delete process.env.GITHUB_WORKFLOW;
+      delete process.env.GH_AW_WORKFLOW_ID;
     });
   });
 
diff --git a/scratchpad/serena-tools-data.json b/scratchpad/serena-tools-data.json
index 277c91768a..3bdfa01b89 100644
--- a/scratchpad/serena-tools-data.json
+++ b/scratchpad/serena-tools-data.json
@@ -132,14 +132,7 @@
     }
   ],
   "serena_tools_detail": {
-    "used_tools": [
-      "mcp__serena__check_onboarding_performed",
-      "mcp__serena__find_symbol",
-      "mcp__serena__get_current_config",
-      "mcp__serena__initial_instructions",
-      "mcp__serena__list_memories",
-      "mcp__serena__search_for_pattern"
-    ],
+    "used_tools": ["mcp__serena__check_onboarding_performed", "mcp__serena__find_symbol", "mcp__serena__get_current_config", "mcp__serena__initial_instructions", "mcp__serena__list_memories", "mcp__serena__search_for_pattern"],
     "unused_registered_tools": [
       "serena___activate_project",
       "serena___delete_memory",
@@ -448,4 +441,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}