diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c9a75183e..deb36016e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @lukasniemeier-zalando @fatroom @Semernitskaya @dingxiangfei2009 @joyfolk @gpradeepkrishna
+* @lukasniemeier-zalando @fatroom @dingxiangfei2009 @joyfolk @gpradeepkrishna @cberg-zalando
diff --git a/MAINTAINERS b/MAINTAINERS
index dc57beeec..bde0d89bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,3 +1,3 @@
 Lukas Niemeier <lukas.niemeier@zalando.de>
 Roman Romanchuk <roman.romanchuk@zalando.de>
-Willi Schönborn <w.schoenborn@gmail.com>
+Christoph Berg <christoph.berg@zalando.de>