diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index df10e07..faa6830 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,4 +4,10 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 # they will be requested for review when someone opens a pull request.
-* @AlejandroFernandezLuces @RobPasMue
\ No newline at end of file
+* @ansys-internal/ansys-common-tools-maintainers
+
+# Local launcher
+/src/ansys/common/tools/launcher/* @greschd
+
+# Documentation
+/doc/source/* @PipKat
\ No newline at end of file
diff --git a/doc/source/changelog/63.miscellaneous.md b/doc/source/changelog/63.miscellaneous.md
new file mode 100644
index 0000000..888cbae
--- /dev/null
+++ b/doc/source/changelog/63.miscellaneous.md
@@ -0,0 +1 @@
+Maint: Add CI bot to CODEOWNERS