diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index 465b56fc06b..760e34eef51 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -1,3 +1,12 @@
+---
+name: Documentation
+about: Help improve the documentation
+title: '[Doc][Module Name] Documentation title'
+labels: type/docs
+assignees: ''
+
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -14,14 +23,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
----
-name: Documentation
-about: Help improve the documentation
-title: '[Doc][Module Name] Documentation title'
-labels: type/docs
-assignees: ''
-
----
 
 ## Documentation Scope
 Briefly explain what the documentation is referencing. For instance, the main README, website, API doc, etc.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 6d3c961bc64..67d905040e6 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,3 +1,12 @@
+---
+name: Question
+about: Ask a question
+title: '[Question][Module Name] Question title'
+labels: type/question
+assignees: ''
+
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -14,14 +23,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
----
-name: Question
-about: Ask a question
-title: '[Question][Module Name] Question title'
-labels: type/question
-assignees: ''
-
----
 
 ## Question
 Ask a question here.
diff --git a/.github/ISSUE_TEMPLATE/refactor.md b/.github/ISSUE_TEMPLATE/refactor.md
index cf6391d6e31..7fe500afc7e 100644
--- a/.github/ISSUE_TEMPLATE/refactor.md
+++ b/.github/ISSUE_TEMPLATE/refactor.md
@@ -1,3 +1,12 @@
+---
+name: Refactor
+about: Improve operation without altering functionality
+title: '[Refactor][Module Name] Refactor title'
+labels: type/refactor
+assignees: ''
+
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -14,14 +23,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
----
-name: Refactor
-about: Improve operation without altering functionality
-title: '[Refactor][Module Name] Refactor title'
-labels: type/refactor
-assignees: ''
-
----
 
 ## What and why to refactor
 What are you trying to refactor? Why should it be refactored now?
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 70b9f774bc8..4d03ef18aff 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -47,7 +47,8 @@ header:
     - "**/*.conf"
     - "deployment/helm/templates/_helpers.tpl"
     - "**/poetry.lock"
-    - 'config-ui/.yarn/**/*'
+    - "config-ui/.yarn/**/*"
     - "config-ui/yarn.lock"
+    - ".github/ISSUE_TEMPLATE/*.md"
 
   comment: on-failure