diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5dcc13a8..87467924 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,5 @@
-<!--
-    SPDX-License-Identifier: Apache-2.0
--->
 ---
+# SPDX-License-Identifier: Apache-2.0
 name: Bug report
 about: Create a report to help us improve
 title: ''
diff --git a/.github/ISSUE_TEMPLATE/compatibility-certification-request.md b/.github/ISSUE_TEMPLATE/compatibility-certification-request.md
index 18b6f3d8..17e70309 100644
--- a/.github/ISSUE_TEMPLATE/compatibility-certification-request.md
+++ b/.github/ISSUE_TEMPLATE/compatibility-certification-request.md
@@ -1,7 +1,5 @@
-<!--
-    SPDX-License-Identifier: Apache-2.0
--->
 ---
+# SPDX-License-Identifier: Apache-2.0
 name: Compatibility certification request
 about: Request certification of a compatibile implementation of Jakarta EE
 title: Compatibility certification request [CDI]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index a3eb22be..62e0b123 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,5 @@
-<!--
-    SPDX-License-Identifier: Apache-2.0
--->
 ---
+# SPDX-License-Identifier: Apache-2.0
 name: Feature request
 about: Suggest an idea for this project
 title: ''