diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000..1f70593ce
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,4 @@
+# https://help.github.com/articles/about-codeowners/
+# https://git-scm.com/docs/gitignore#_pattern_format
+
+* @fstab @dhoard @zeitlinger @jaydeluca
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index cf0a885eb..a247eb14a 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -2,5 +2,9 @@
 
 - Fabian Stäber <fabian@fstab.de> @fstab
 - Doug Hoard <doug.hoard@gmail.com> @dhoard
-- Tom Wilkie <tom@grafana.com> @tomwilkie
 - Gregor Zeitlinger <gregor.zeitlinger@grafana.com> @zeitlinger
+- Jay DeLuca <jaydeluca4@gmail.com> @jaydeluca
+
+## Emeritus
+
+- Tom Wilkie <tom@grafana.com> @tomwilkie