diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dc0c91864..0ea6c71cb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,7 @@
-* @cwrau
-/charts/*/Chart.yaml @cwrau @teutonet-bot
+* @teutonet/k8s
+/charts/base-cluster/ @cwrau @marvinWolff @tasches  @teutonet-bot
+/charts/ckan/ @cwrau @marvinWolff @syeklu @tasches  @teutonet-bot
+/charts/common/ @cwrau @marvinWolff @tasches  @teutonet-bot
+/charts/stellio-context-broker/ @cwrau @ocaner-biz  @teutonet-bot
+/charts/t8s-cluster/ @cwrau @marvinWolff @tasches  @teutonet-bot
+/charts/teuto-portal-k8s-worker/ @cwrau @marvinWolff @tasches  @teutonet-bot