1 files changed, 41 insertions, 44 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7f368ceb7..95116696f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,52 +5,49 @@
 * @Ferroin
 
 # Ownership by directory structure
-.github/ @Ferroin @tkatsoulas
-aclk/ @stelfrag @underhood
-build/ @Ferroin @tkatsoulas
-contrib/debian @Ferroin @tkatsoulas
-collectors/ @thiagoftsm
-collectors/ebpf.plugin/ @thiagoftsm
-collectors/charts.d.plugin/ @ilyam8 @Ferroin
-collectors/freebsd.plugin/ @thiagoftsm
-collectors/macos.plugin/ @thiagoftsm
-collectors/python.d.plugin/ @ilyam8
-collectors/cups.plugin/ @thiagoftsm
-exporting/ @thiagoftsm
-daemon/ @thiagoftsm @vkalintiris
-database/ @thiagoftsm @vkalintiris
-docs/ @tkatsoulas @Ancairon
-health/ @thiagoftsm @vkalintiris @MrZammler
-health/health.d/ @thiagoftsm @MrZammler
-health/notifications/ @Ferroin @thiagoftsm @MrZammler
-ml/ @vkalintiris
-libnetdata/ @thiagoftsm @vkalintiris
-packaging/ @Ferroin @tkatsoulas
-registry/ @novykh
-streaming/ @thiagoftsm
-system/ @Ferroin @tkatsoulas
-tests/ @Ferroin @vkalintiris @tkatsoulas
-web/ @thiagoftsm @vkalintiris
-web/gui/ @novykh
-logsmanagement/ @Dim-P @thiagoftsm
+.github/ @netdata/agent-sre
+src/aclk/ @stelfrag
+src/collectors/ @thiagoftsm
+src/collectors/ebpf.plugin/ @thiagoftsm
+src/collectors/charts.d.plugin/ @ilyam8 @Ferroin
+src/collectors/freebsd.plugin/ @thiagoftsm
+src/collectors/macos.plugin/ @thiagoftsm
+src/collectors/python.d.plugin/ @ilyam8
+src/collectors/cups.plugin/ @thiagoftsm
+src/exporting/ @thiagoftsm
+src/daemon/ @thiagoftsm @vkalintiris
+src/database/ @thiagoftsm @vkalintiris
+docs/ @Ancairon
+src/go/ @ilyam8
+src/health/ @thiagoftsm @vkalintiris
+src/health/health.d/ @thiagoftsm
+src/health/notifications/ @Ferroin @thiagoftsm
+src/ml/ @vkalintiris
+src/libnetdata/ @thiagoftsm @vkalintiris
+packaging/ @netdata/agent-sre
+packaging/cmake @Ferroin @vkalintiris
+src/registry/ @novykh
+src/streaming/ @thiagoftsm
+system/ @netdata/agent-sre
+tests/ @netdata/agent-sre @vkalintiris
+src/web/ @thiagoftsm @vkalintiris
+src/web/gui/ @novykh
+src/logsmanagement/ @thiagoftsm
 
 # Ownership by filetype (overwrites ownership by directory)
-*.am @Ferroin @tkatsoulas
-*.md @tkatsoulas @Ancairon
-*.mdx @tkatsoulas @Ancairon
-Dockerfile* @Ferroin @tkatsoulas
+*.md @Ancairon
+*.mdx @Ancairon
+Dockerfile* @netdata/agent-sre
 
 # Ownership of specific files
-.gitignore @Ferroin @tkatsoulas @vkalintiris
-.eslintrc @Ferroin @tkatsoulas
-.eslintignore @Ferroin @tkatsoulas
-.csslintrc @Ferroin @tkatsoulas
-.codeclimate.yml @Ferroin @tkatsoulas
-.codacy.yml @Ferroin @tkatsoulas
-.yamllint.yml @Ferroin @tkatsoulas
-netdata.spec.in @Ferroin @tkatsoulas
-netdata-installer.sh @Ferroin @tkatsoulas
-packaging/version @netdatabot @Ferroin @tkatsoulas
+.gitignore @netdata/agent-sre @vkalintiris
+.codacy.yml @netdata/agent-sre
+.yamllint.yml @netdata/agent-sre
+CMakeLists.txt @netdata/agent-sre @vkalintiris
+netdata.spec.in @netdata/agent-sre
+netdata-installer.sh @netdata/agent-sre
+packaging/version @netdatabot @netdata/agent-sre
+packaging/repoconfig/CMakelists.txt @netdata/agent-sre
 
-LICENSE.md @Ferroin @tkatsoulas @vkalintiris
-CHANGELOG.md @netdatabot @Ferroin @tkatsoulas
+LICENSE.md @netdata/agent-sre @vkalintiris
+CHANGELOG.md @netdatabot @netdata/agent-sre