diff --git a/CODEOWNERS b/CODEOWNERS
index 0ad957f6..6fcbfc33 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @dmcgowan @jzelinskie @jdolitsky @mikebrow @stevvooe @vbatts
+* @dmcgowan @jzelinskie @jonjohnsonjr @jdolitsky @mikebrow @stevvooe @vbatts
diff --git a/MAINTAINERS b/MAINTAINERS
index 7244749d..61bd4cf5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,5 +1,6 @@
 Derek McGowan <derek@mcg.dev> (@dmcgowan)
 Jimmy Zelinskie <jimmy@zelinskie.com> (@jzelinskie)
+Jon Johnson <jonjohnson@google.com> (@jonjohnsonjr)
 Josh Dolitsky <josh@bloodorange.io> (@jdolitsky)
 Mike Brown <brownwm@us.ibm.com> (@mikebrow)
 Stephen Day <stevvooe@gmail.com> (@stevvooe)