diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index e676d06dd..2d7868452 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,10 +1,21 @@
-Maintainers of this repository with their focus areas:
+@brian-brazil is the main/default maintainer, some parts of the codebase have other maintainers:
+
+* `cmd`
+  * `promtool`: @simonpasquier
+* `discovery`
+  * `k8s`: @brancz
+* `documentation`
+  * `prometheus-mixin`: @beorn7
+* `storage`
+  * `remote`: @csmarchbanks, @cstyan
+* `tsdb`: @codesome, @krasi-georgiev
+* `web`
+  * `ui`: @juliusv
+* `Makefile` and related build configuration: @simonpasquier, @SuperQ
+
+For the sake of brevity all subtrees are not explicitly listed. Due to the size
+of this repository, the natural changes in focus of maintainers over time, and
+nuances of where particular features live, this list will always be incomplete
+and out of date. However the listed maintainer(s) should be able to direct a
+PR/question to the right person.
 
-* Brian Brazil <brian.brazil@robustperception.io> @brian-brazil: Console templates; semantics of PromQL, service discovery, and relabeling.
-* Fabian Reinartz <freinartz@google.com> @fabxc: PromQL parsing and evaluation; implementation of retrieval, alert notification, and service discovery.
-* Julius Volz <julius.volz@gmail.com> @juliusv: Web UI.
-* Krasi Georgiev <kgeorgie@redhat.com> @krasi-georgiev: TSDB - the storage engine.
-* Ganesh Vernekar <cs15btech11018@iith.ac.in> @codesome: TSDB - the storage engine.
-* Chris Marchbanks <csmarchbanks@gmail.com> @csmarchbanks: Remote write integration.
-* Callum Styan <callumstyan@gmail.com> @cstyan: Remote write integration.
-* Bartłomiej Płotka <bwplotka@gmail.com> @bwplotka: Remote read integration.