diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..d5ca2df4d
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,4 @@
+# The following users/teams will get auto-tagged for a review.
+# See https://docs.github.com/en/enterprise/2.15/user/articles/about-code-owners
+
+* @gudmdharalds
diff --git a/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
similarity index 100%
rename from ISSUE_TEMPLATE
rename to .github/ISSUE_TEMPLATE
diff --git a/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
similarity index 100%
rename from PULL_REQUEST_TEMPLATE
rename to .github/PULL_REQUEST_TEMPLATE