diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..f77be596
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @nats-io/server
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2dd0085a..c55a8777 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,5 +13,3 @@ Resolves #
  -
  -
  -
-
-/cc @nats-io/core