diff --git a/.github/policies/labelAdded.noRecentActivity.yml b/.github/policies/labelAdded.noRecentActivity.yml
index 4ec57a8aac..71ec7ccaab 100644
--- a/.github/policies/labelAdded.noRecentActivity.yml
+++ b/.github/policies/labelAdded.noRecentActivity.yml
@@ -18,13 +18,13 @@ configuration:
         then:
           - addReply:
               reply: >-
-                Hello @${issueAuthor},
+                Hello ${issueAuthor},
 
 
                 This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
 
 
-                Template: msftbot/noRecentActivity
+                ###### Template: msftbot/noRecentActivity
         # The policy service should trigger even when the label was added by the policy service
         triggerOnOwnActions: true
       - description: >-
@@ -37,13 +37,13 @@ configuration:
         then:
           - addReply:
               reply: >-
-                Hello @${issueAuthor},
+                Hello ${issueAuthor},
 
 
                 This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
 
 
-                Template: msftbot/noRecentActivity
+                ###### Template: msftbot/noRecentActivity
         # The policy service should trigger even when the label was added by the policy service
         triggerOnOwnActions: true
 onFailure:
diff --git a/.github/policies/labelManagement.issueOpened.yml b/.github/policies/labelManagement.issueOpened.yml
index 96e6fa1d07..d960f31efe 100644
--- a/.github/policies/labelManagement.issueOpened.yml
+++ b/.github/policies/labelManagement.issueOpened.yml
@@ -44,7 +44,7 @@ configuration:
                 Instead of this PR, it would be helpful if you could [open an issue](https://github.com/microsoft/winget-cli/issues/new?template=Localization_Issue.yml) and it will be forwarded to the internal localization team for review. For more information, please see the [Development Guide](https://github.com/microsoft/winget-cli/blob/master/doc/Developing.md#localization).
 
 
-                Template: msftbot/PullRequests/LocalizationFileChange
+                ###### Template: msftbot/PullRequests/LocalizationFileChange
       - description: Add Needs-Triage to new issues
         if:
           - payloadType: Issues
diff --git a/.github/policies/labelManagement.needsFeedbackHub.yml b/.github/policies/labelManagement.needsFeedbackHub.yml
index 02c9db5f8b..0abc0b9bd0 100644
--- a/.github/policies/labelManagement.needsFeedbackHub.yml
+++ b/.github/policies/labelManagement.needsFeedbackHub.yml
@@ -35,7 +35,7 @@ configuration:
         then:
           - addReply:
               reply: >-
-                Hello @${issueAuthor},
+                Hello ${issueAuthor},
 
 
                 Please send us feedback with the Feedback Hub [Windows]+[f] with this issue and paste the link here so we can more easily find your crash information on the back end.
@@ -46,7 +46,7 @@ configuration:
                 The link on the bottom of the feedback report will provide the URL to paste in this Issue to share with us.
 
 
-                Template: msftbot/feedbackHub
+                ###### Template: msftbot/feedbackHub
           - assignTo:
               author: True
           - addLabel:
diff --git a/.github/policies/moderatorTriggers.yml b/.github/policies/moderatorTriggers.yml
index b85a389dfd..164485b765 100644
--- a/.github/policies/moderatorTriggers.yml
+++ b/.github/policies/moderatorTriggers.yml
@@ -556,13 +556,13 @@ configuration:
                 then:
                   - addReply:
                       reply: >-
-                        Hello @${issueAuthor},
+                        Hello ${issueAuthor},
 
 
                         We've identified this as a duplicate of another issue or PR that already exists. This specific instance is being closed in favor of the linked issue. Please add your 👍 to the other issue to raise its priority. Thanks for your contribution!
 
 
-                        Template: msftbot/duplicate/closed
+                        ###### Template: msftbot/duplicate/closed
                   - closeIssue
                   - removeLabel:
                       label: Needs-Triage