diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d801514c3..14195c36b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,2 @@
-* @snowpackjs/maintainers
+README.md @withastro/maintainers-docs
+packages/astro/src/@types/astro.ts @withastro/maintainers-docs
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index edec77376..59e8413b6 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,6 +12,9 @@
 
 ## Docs
 
-<!-- Is this a visible change? You probably need to update docs! -->
+<!-- Could this affect a user’s behavior? We probably need to update docs! -->
+<!-- If docs will be needed or you’re not sure, uncomment the next line: -->
+<!-- /cc @withastro/maintainers-docs for feedback! -->
+
 <!-- DON'T DELETE THIS SECTION! If no docs added, explain why.-->
-<!-- https://github.com/withastro/docs -->
\ No newline at end of file
+<!-- https://github.com/withastro/docs -->