diff --git a/CODEOWNERS b/CODEOWNERS
index dbb5af8cd7c..20939a2b83a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,2 @@
-* @joe-elliott @annanay25 @mdisibio @mapno @kvrhdn @zalegrala
-/docs/ @knylander-grafana @joe-elliott @annanay25 @mdisibio @mapno @kvrhdn @zalegrala
+* @joe-elliott @annanay25 @mdisibio @mapno @kvrhdn @zalegrala @electron0zero
+/docs/ @knylander-grafana @joe-elliott @annanay25 @mdisibio @mapno @kvrhdn @zalegrala @electron0zero
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index bc289b6dd16..51b85130b5b 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -52,6 +52,7 @@ The current team members are:
 - Mario Rodriguez - [mapno](https://github.com/mapno) ([Grafana Labs](https://grafana.com/))
 - Marty Disibio - [mdisibio](https://github.com/mdisibio) ([Grafana Labs](https://grafana.com/))
 - Zach Leslie - [zalegrala](https://github.com/zalegrala) ([Grafana Labs](https://grafana.com/))
+- Suraj Nath - [electron0zero](https://github.com/electron0zero) ([Grafana Labs](https://grafana.com/))
 
 ### Maintainers
 
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 6c7a19e33e7..dd361d275f9 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -3,4 +3,5 @@
 * @kvrhdn
 * @mapno
 * @mdisibio
-* @zalegrala
\ No newline at end of file
+* @zalegrala
+* @electron0zero
\ No newline at end of file