diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2ca5435..cdc24c3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,2 @@
-# PhDamage Code Owners
-# These users will be automatically requested for review on PRs
-
 * @Xerrion
+.github/ @Xerrion
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 96d925a..15b1687 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -3,6 +3,8 @@ description: Report a bug with PhDamage
 title: "[Bug]: "
 labels:
   - bug
+assignees:
+  - Xerrion
 body:
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 559b5d0..23b4cbc 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -3,7 +3,8 @@ description: Suggest a new feature or improvement for PhDamage
 title: "[Feature]: "
 labels:
   - enhancement
-assignees: []
+assignees:
+  - Xerrion
 body:
   - type: textarea
     id: problem-motivation