diff --git a/CODEOWNERS b/CODEOWNERS
index 37313296a9..3110abc865 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,4 @@
 /.github/ @bo0tzz
 /docker/ @bo0tzz
+/server/ @danieldietzler
+/e2e/ @danieldietzler