diff --git a/.github/workflows/agentics-maintenance.yml b/.github/workflows/agentics-maintenance.yml
index 8e44c718271..13a0d8a8848 100644
--- a/.github/workflows/agentics-maintenance.yml
+++ b/.github/workflows/agentics-maintenance.yml
@@ -389,26 +389,26 @@ jobs:
             const fs = require('node:fs');
             const reportPath = './.cache/gh-aw/activity-report-logs/report.md';
             if (!fs.existsSync(reportPath)) {
-              core.warning(`Activity report markdown not found at ${reportPath}; skipping issue creation.`);
+              core.warning('Activity report markdown not found at ' + reportPath + '; skipping issue creation.');
               return;
             }
             let reportBody = '';
             try {
               reportBody = fs.readFileSync(reportPath, 'utf8').trim();
             } catch (error) {
-              core.warning(`Failed to read activity report markdown at ${reportPath}: ${error.message}`);
+              core.warning('Failed to read activity report markdown at ' + reportPath + ': ' + error.message);
               return;
             }
             if (!reportBody) {
-              core.warning(`Activity report markdown is empty at ${reportPath}; skipping issue creation.`);
+              core.warning('Activity report markdown is empty at ' + reportPath + '; skipping issue creation.');
               return;
             }
-            const repoSlug = `${context.repo.owner}/${context.repo.repo}`;
+            const repoSlug = context.repo.owner + '/' + context.repo.repo;
             const body = [
               '### Agentic workflow activity report',
               '',
-              `Repository: ${repoSlug}`,
-              `Generated at: ${new Date().toISOString()}`,
+              'Repository: ' + repoSlug,
+              'Generated at: ' + new Date().toISOString(),
               '',
               reportBody,
             ].join('\n');
@@ -419,7 +419,7 @@ jobs:
               body,
               labels: ['agentic-workflows'],
             });
-            core.info(`Created issue #${createdIssue.data.number}: ${createdIssue.data.html_url}`);
+            core.info('Created issue #' + createdIssue.data.number + ': ' + createdIssue.data.html_url);
 
   close_agentic_workflows_issues:
     if: ${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call') && inputs.operation == 'close_agentic_workflows_issues' && (!(github.event.repository.fork)) }}
diff --git a/actions/setup/js/comment_memory.cjs b/actions/setup/js/comment_memory.cjs
index 950e3e5f748..81889b6a90a 100644
--- a/actions/setup/js/comment_memory.cjs
+++ b/actions/setup/js/comment_memory.cjs
@@ -2,7 +2,6 @@
 /// <reference types="@actions/github-script" />
 require("./shim.cjs");
 
-const path = require("path");
 const { sanitizeContent } = require("./sanitize_content.cjs");
 const { getErrorMessage } = require("./error_helpers.cjs");
 const { SAFE_OUTPUT_E001 } = require("./error_codes.cjs");
@@ -20,7 +19,14 @@ const { COMMENT_MEMORY_TAG, COMMENT_MEMORY_MAX_SCAN_PAGES } = require("./comment
 // that happen to contain a matching comment-memory tag.
 const MANAGED_COMMENT_PROVENANCE_MARKER = "<!-- gh-aw-agentic-workflow:";
 const MANAGED_COMMENT_HEADER = "### Comment Memory";
-const MANAGED_COMMENT_DISCLOSURE_NOTE_PATH = path.join(__dirname, "../md/comment_memory_disclosure_note.md");
+
+function renderManagedCommentDisclosureNote() {
+  const promptsDir = process.env.GH_AW_PROMPTS_DIR || `${process.env.RUNNER_TEMP}/gh-aw/prompts`;
+  const templatePath = `${promptsDir}/comment_memory_disclosure_note.md`;
+  return renderTemplateFromFile(templatePath, {
+    comment_memory_tag: COMMENT_MEMORY_TAG,
+  });
+}
 
 function sanitizeMemoryID(memoryID) {
   const normalized = String(memoryID || "default").trim();
@@ -32,7 +38,7 @@ function sanitizeMemoryID(memoryID) {
 }
 
 function buildManagedMemoryBody(rawBody, memoryID, options) {
-  const { includeFooter, runUrl, workflowName, workflowSource, workflowSourceURL, historyUrl, triggeringIssueNumber, triggeringPRNumber, disclosureNote } = options;
+  const { includeFooter, runUrl, workflowName, workflowSource, workflowSourceURL, historyUrl, triggeringIssueNumber, triggeringPRNumber } = options;
   if (!/^[a-zA-Z0-9_-]+$/.test(memoryID)) {
     throw new Error(`${SAFE_OUTPUT_E001}: memory_id must contain only alphanumeric characters, hyphens, and underscores`);
   }
@@ -48,11 +54,7 @@ function buildManagedMemoryBody(rawBody, memoryID, options) {
 
   if (includeFooter) {
     core.info(`comment_memory: footer enabled for memory_id='${memoryID}'`);
-    const resolvedDisclosureNote =
-      disclosureNote ??
-      renderTemplateFromFile(MANAGED_COMMENT_DISCLOSURE_NOTE_PATH, {
-        comment_memory_tag: COMMENT_MEMORY_TAG,
-      });
+    const resolvedDisclosureNote = renderManagedCommentDisclosureNote();
     body += "\n\n" + resolvedDisclosureNote;
     body += "\n\n" + generateFooterWithMessages(workflowName, runUrl, workflowSource, workflowSourceURL, triggeringIssueNumber, triggeringPRNumber, undefined, historyUrl).trimEnd();
   } else {
@@ -118,7 +120,6 @@ async function main(config = {}) {
   core.info(`comment_memory: initialized with max=${maxCount}, defaultMemoryID='${defaultMemoryID}', target='${target}', footer=${includeFooter}, staged=${staged}`);
 
   let processedCount = 0;
-  let cachedDisclosureNote = null;
 
   return async message => {
     if (!message || message.type !== "comment_memory") {
@@ -175,12 +176,6 @@ async function main(config = {}) {
         serverUrl: context.serverUrl,
       }) || undefined;
 
-    if (cachedDisclosureNote === null) {
-      cachedDisclosureNote = renderTemplateFromFile(MANAGED_COMMENT_DISCLOSURE_NOTE_PATH, {
-        comment_memory_tag: COMMENT_MEMORY_TAG,
-      });
-    }
-
     const managedBody = buildManagedMemoryBody(message.body || "", memoryID, {
       includeFooter,
       runUrl,
@@ -190,7 +185,6 @@ async function main(config = {}) {
       historyUrl,
       triggeringIssueNumber,
       triggeringPRNumber,
-      disclosureNote: cachedDisclosureNote,
     });
     try {
       enforceCommentLimits(managedBody);
diff --git a/actions/setup/js/comment_memory.test.cjs b/actions/setup/js/comment_memory.test.cjs
index f67039750ce..dea680ecf09 100644
--- a/actions/setup/js/comment_memory.test.cjs
+++ b/actions/setup/js/comment_memory.test.cjs
@@ -1,7 +1,24 @@
 // @ts-check
-import { describe, it, expect } from "vitest";
+import { describe, it, expect, beforeAll, afterAll } from "vitest";
+import path from "path";
+import { fileURLToPath } from "url";
 
 describe("comment_memory", () => {
+  let originalPromptsDir;
+
+  beforeAll(() => {
+    originalPromptsDir = process.env.GH_AW_PROMPTS_DIR;
+    process.env.GH_AW_PROMPTS_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), "../md");
+  });
+
+  afterAll(() => {
+    if (originalPromptsDir === undefined) {
+      delete process.env.GH_AW_PROMPTS_DIR;
+      return;
+    }
+    process.env.GH_AW_PROMPTS_DIR = originalPromptsDir;
+  });
+
   it("sanitizes valid memory IDs", async () => {
     const module = await import("./comment_memory.cjs");
     expect(module.sanitizeMemoryID("Session_1")).toBe("Session_1");