diff --git a/.github/ISSUE_TEMPLATES/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 62%
rename from .github/ISSUE_TEMPLATES/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 58d3519..b022aed 100644
--- a/.github/ISSUE_TEMPLATES/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2025 Alexandre Gomes Gaigalas <alganet@gmail.com>
-
-SPDX-License-Identifier: ISC
--->
 ---
 name: Bug Report
 about: Report a bug
@@ -20,5 +15,6 @@ Steps to reproduce.
 What should happen.
 
 **Environment**
-- OS: 
-- Python version:
\ No newline at end of file
+- OS:
+- Python version:
+- apywire version:
diff --git a/.github/ISSUE_TEMPLATES/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 63%
rename from .github/ISSUE_TEMPLATES/feature_request.md
rename to .github/ISSUE_TEMPLATE/feature_request.md
index 23a2c87..f9184b3 100644
--- a/.github/ISSUE_TEMPLATES/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,8 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2025 Alexandre Gomes Gaigalas <alganet@gmail.com>
-
-SPDX-License-Identifier: ISC
--->
 ---
 name: Feature Request
 about: Suggest a new feature
@@ -17,4 +12,4 @@ Describe the problem.
 What do you want to happen.
 
 **Alternatives**
-Any alternatives considered.
\ No newline at end of file
+Any alternatives considered.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9247d72..a6a3e0f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,12 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2025 Alexandre Gomes Gaigalas <alganet@gmail.com>
-
-SPDX-License-Identifier: ISC
--->
-## Description
-
-Brief description of changes.
-
 ## Type of Change
 
 - [ ] Bug fix
@@ -14,9 +5,3 @@ Brief description of changes.
 - [ ] New feature
 - [ ] Breaking change
 - [ ] Documentation update
-
-## Checklist
-
-- [ ] Descriptive and concise commit message and PR details
-- [ ] Docstrings updated
-- [ ] Documentation updated
diff --git a/.vscode/extensions.json.license b/.vscode/extensions.json.license
deleted file mode 100644
index 2b1a571..0000000
--- a/.vscode/extensions.json.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2025 Alexandre Gomes Gaigalas <alganet@gmail.com>
-
-SPDX-License-Identifier: ISC
diff --git a/.vscode/settings.json.license b/.vscode/settings.json.license
deleted file mode 100644
index 2b1a571..0000000
--- a/.vscode/settings.json.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2025 Alexandre Gomes Gaigalas <alganet@gmail.com>
-
-SPDX-License-Identifier: ISC
diff --git a/REUSE.toml b/REUSE.toml
index 790eaf3..97bb5dc 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -16,3 +16,8 @@ precedence = "aggregate"
 SPDX-FileCopyrightText = "2025 Alexandre Gomes Gaigalas <alganet@gmail.com>"
 SPDX-License-Identifier = "ISC"
 
+[[annotations]]
+path = [ ".vscode/**", ".github/PULL_REQUEST_TEMPLATE.md", ".github/ISSUE_TEMPLATE/**" ]
+SPDX-FileCopyrightText = "2025 Alexandre Gomes Gaigalas <alganet@gmail.com>"
+SPDX-License-Identifier = "ISC"
+