diff --git a/CODEOWNERS b/CODEOWNERS
index 3a24766775..1822bf63d1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -17,6 +17,7 @@
 /storage/remote                 @prometheus/default-maintainers @cstyan @bwplotka @tomwilkie @alexgreenbank
 /storage/remote/otlptranslator  @prometheus/default-maintainers @aknuds1 @jesusvazquez @ArthurSens
 /tsdb                           @prometheus/default-maintainers @jesusvazquez @codesome @bwplotka @krajorama
+/tsdb/agent                     @prometheus/default-maintainers @jesusvazquez @codesome @bwplotka @krajorama @kgeckhart
 
 # Service discovery.
 /discovery/kubernetes           @prometheus/default-maintainers @brancz @rexagod
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 71463707de..57dc9811e9 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -25,6 +25,7 @@ Maintainers for specific parts of the codebase:
   * `remote`: Callum Styan (<callumstyan@gmail.com> / @cstyan), Tom Wilkie (tom.wilkie@gmail.com / @tomwilkie), Alex Greenbank (<alexgreenbank@yahoo.com> / @alexgreenbank)
     * `otlptranslator`: Arthur Silva Sens (<arthursens2005@gmail.com> / @ArthurSens, Jesús Vázquez (<jesus.vazquez@grafana.com> / @jesusvazquez)
 * `tsdb`: Ganesh Vernekar (<ganesh@grafana.com> / @codesome), Jesús Vázquez (<jesus.vazquez@grafana.com> / @jesusvazquez)
+    * `agent`: Kyle Eckhart (<kyle.eckhart@grafana.com> / @kgeckhart)
 * `web`
   * `ui`: Julius Volz (<julius.volz@gmail.com> / @juliusv)
     * `module`: Augustin Husson (<husson.augustin@gmail.com> / @nexucis)