diff --git a/agent/prompt.py b/agent/prompt.py
index 70194104..cfde646a 100644
--- a/agent/prompt.py
+++ b/agent/prompt.py
@@ -294,6 +294,9 @@ When you have completed your implementation, follow these steps in order:
    <1-3 sentences on WHY and the approach.
    NO "Changes:" section — file changes are already in the commit history.>
 
+   ## Release Note
+   <One-line changelog summary for self-hosted customers, or "none" for internal/CI/test/refactor changes.>
+
    ## Test Plan
    - [ ] <new/novel verification steps only — NOT "run existing tests" or "verify existing behavior">
    ```
diff --git a/agent/tools/commit_and_open_pr.py b/agent/tools/commit_and_open_pr.py
index c893d16c..aa74895f 100644
--- a/agent/tools/commit_and_open_pr.py
+++ b/agent/tools/commit_and_open_pr.py
@@ -89,6 +89,11 @@ def commit_and_open_pr(
         DO NOT list files changed or enumerate code
         changes — that information is already in the commit history.>
 
+        ## Release Note
+        <One-line summary for the changelog, written for self-hosted customers.
+        Write "none" for changes that don't need a changelog entry
+        (internal, CI, tests, refactors, etc.)>
+
         ## Test Plan
         - [ ] <new test case or manual verification step ONLY for new behavior>
 
@@ -107,6 +112,9 @@ def commit_and_open_pr(
 
         Resolves AA-123
 
+        ## Release Note
+        Fixed authentication failure for users without profiles.
+
         ## Test Plan
         - [ ] Verify login works for users without profiles
 
@@ -118,7 +126,8 @@ def commit_and_open_pr(
 
     Args:
         title: PR title following the format above (e.g. "fix: resolve auth bug [closes AA-123]")
-        body: PR description following the template above with ## Description and ## Test Plan
+        body: PR description following the template above with ## Description,
+            ## Release Note, and ## Test Plan
         commit_message: Optional git commit message. If not provided, the PR title is used.
 
     Returns: