diff --git a/ansible/roles/github/templates/PULL_REQUEST_TEMPLATE.md.j2 b/ansible/roles/github/templates/PULL_REQUEST_TEMPLATE.md.j2
index 12deedc4..a6ef812b 100644
--- a/ansible/roles/github/templates/PULL_REQUEST_TEMPLATE.md.j2
+++ b/ansible/roles/github/templates/PULL_REQUEST_TEMPLATE.md.j2
@@ -1,5 +1,5 @@
 {%- set markdown="gfm" -%}
-{{- noter -}}
+{% from 'common_macros.j2' import noter with context %}
 {% if project_deprecation_status %}
 {% include "deprecation.md.j2" | trim %}
 
diff --git a/ansible/roles/github/templates/issue.bug.yml.j2 b/ansible/roles/github/templates/issue.bug.yml.j2
index 14275f26..1bc69407 100644
--- a/ansible/roles/github/templates/issue.bug.yml.j2
+++ b/ansible/roles/github/templates/issue.bug.yml.j2
@@ -1,5 +1,5 @@
 {%- set markdown="gfm" -%}
-{{- noter -}}
+{% from 'common_macros.j2' import noter with context %}
 # Based on the issue template
 name: Bug report
 description: Create a report to help us improve
diff --git a/ansible/roles/github/templates/issue.feature.yml.j2 b/ansible/roles/github/templates/issue.feature.yml.j2
index d3a9771f..bbfe6e8e 100644
--- a/ansible/roles/github/templates/issue.feature.yml.j2
+++ b/ansible/roles/github/templates/issue.feature.yml.j2
@@ -1,5 +1,5 @@
 {%- set markdown="gfm" -%}
-{{- noter -}}
+{% from 'common_macros.j2' import noter with context %}
 # Based on the issue template
 name: Feature request
 description: Suggest an idea for this project