diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..e680df05
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*       @freifunkMUC/firmware @maurerle
diff --git a/CODEOWNERS b/CODEOWNERS
deleted file mode 100644
index d870786f..00000000
--- a/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-*       @freifunkMUC/firmware