diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 865abeebd82af2..2e7d0f4692e735 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,7 @@
-/.github/workflows/ @JuliaLang/github-actions
+/.github/ @JuliaLang/github-actions 
+/.buildkite/ @JuliaLang/github-actions
+/src/ @JuliaLang/compiler
+/stdlib/LinearAlgebra/ @JuliaLang/linearalgebra
+/stdlib/libblastrampoline_jll/ @staticfloat
+/test/ @JuliaLang/test
+