diff --git a/CODEOWNERS b/CODEOWNERS
index 46e20ffd123..6437ca6b321 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,2 @@
-* @joe-elliott @annanay25 @mdisibio @mapno @kvrhdn @zalegrala @electron0zero @ie-pham
-/docs/ @knylander-grafana @joe-elliott @annanay25 @mdisibio @mapno @kvrhdn @zalegrala @electron0zero @ie-pham
+* @joe-elliott @annanay25 @mdisibio @mapno @kvrhdn @zalegrala @electron0zero @ie-pham @stoewer
+/docs/ @knylander-grafana @joe-elliott @annanay25 @mdisibio @mapno @kvrhdn @zalegrala @electron0zero @ie-pham @stoewer
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index e62ef7e4bf0..77aafbd1af2 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -54,6 +54,7 @@ The current team members are:
 - Koenraad Verheyden - [kvrhdn](https://github.com/kvrhdn) ([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/))
+- Adrian Stoewer - [stoewer](https://github.com/stoewer) ([Grafana Labs](https://grafana.com/))
 - Zach Leslie - [zalegrala](https://github.com/zalegrala) ([Grafana Labs](https://grafana.com/))
 
 ### Maintainers
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index c3fbdd67980..16cec25de94 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -6,4 +6,5 @@
 * @kvrhdn
 * @mapno
 * @mdisibio
+* @stoewer
 * @zalegrala
\ No newline at end of file