diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 67582267d..985806d5b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,10 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2022 Slavi Pantaleev
-SPDX-FileCopyrightText: 2024 Suguru Hirahara
-
-SPDX-License-Identifier: AGPL-3.0-or-later
--->
-
 ---
 name: Bug report
 about: Create a report to help us improve
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md.license b/.github/ISSUE_TEMPLATE/bug_report.md.license
new file mode 100644
index 000000000..3e8049371
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2022 Slavi Pantaleev
+SPDX-FileCopyrightText: 2024 Suguru Hirahara
+
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 0b21a2fef..5746ab313 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,10 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2022 Slavi Pantaleev
-SPDX-FileCopyrightText: 2024 Suguru Hirahara
-
-SPDX-License-Identifier: AGPL-3.0-or-later
--->
-
 ---
 name: Feature request
 about: Suggest an idea for this project
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md.license b/.github/ISSUE_TEMPLATE/feature_request.md.license
new file mode 100644
index 000000000..3e8049371
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2022 Slavi Pantaleev
+SPDX-FileCopyrightText: 2024 Suguru Hirahara
+
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/.github/ISSUE_TEMPLATE/i-need-help.md b/.github/ISSUE_TEMPLATE/i-need-help.md
index 9f76ce259..03632d440 100644
--- a/.github/ISSUE_TEMPLATE/i-need-help.md
+++ b/.github/ISSUE_TEMPLATE/i-need-help.md
@@ -1,10 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2022 Slavi Pantaleev
-SPDX-FileCopyrightText: 2024 Suguru Hirahara
-
-SPDX-License-Identifier: AGPL-3.0-or-later
--->
-
 ---
 name: I need help
 about: Get support from our community
diff --git a/.github/ISSUE_TEMPLATE/i-need-help.md.license b/.github/ISSUE_TEMPLATE/i-need-help.md.license
new file mode 100644
index 000000000..3e8049371
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/i-need-help.md.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2022 Slavi Pantaleev
+SPDX-FileCopyrightText: 2024 Suguru Hirahara
+
+SPDX-License-Identifier: AGPL-3.0-or-later