diff --git a/CODEOWNERS b/CODEOWNERS
index 2f627ed2c80..793814c3762 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,2 @@
-* @joe-elliott @annanay25 @mdisibio @dgzlopes
-/docs/ @achatterjee-grafana @joe-elliott @annanay25 @mdisibio @dgzlopes
\ No newline at end of file
+* @joe-elliott @annanay25 @mdisibio @dgzlopes @mapno
+/docs/ @achatterjee-grafana @joe-elliott @annanay25 @mdisibio @dgzlopes @mapno
\ No newline at end of file
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index ad2d0580e41..d8843aac72e 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -49,6 +49,7 @@ The current team members are:
 - Annanay Agarwal - [annanay25](https://github.com/annanay25) ([Grafana Labs](https://grafana.com/))
 - Daniel González - [dgzlopes](https://github.com/dgzlopes) ([k6.io](https://k6.io/))
 - Joe Elliott - [joe-elliott](https://github.com/joe-elliott) ([Grafana Labs](https://grafana.com/))
+- Mario Rodriguez - [mapno](https://github.com/mapno) ([Grafana Labs](https://grafana.com/))
 - Marty Disibio - [mdisibio](https://github.com/mdisibio) ([Grafana Labs](https://grafana.com/))
 
 ### Maintainers
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 8d3f58a157f..9c10643b378 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,4 +1,5 @@
 * @annanay25
 * @dgzlopes
 * @joe-elliott
+* @mapno
 * @mdisibio
\ No newline at end of file