diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6e9030b86131ee..c9464b67f5e654 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -60,9 +60,9 @@
 /components/supervisor-api @csweichel @akosyakov
 /components/supervisor @gitpod-io/engineering-ide
 /components/workspacekit @gitpod-io/engineering-workspace
-/components/ws-daemon-api @csweichel @aledbf
+/components/ws-daemon-api @aledbf @Furisto
 /components/ws-daemon @gitpod-io/engineering-workspace
-/components/ws-manager-api @csweichel @aledbf
+/components/ws-manager-api @aledbf @sagor999
 /components/ws-manager-bridge-api @csweichel @geropl
 /components/ws-manager-bridge @gitpod-io/engineering-webapp
 /components/ws-manager @gitpod-io/engineering-workspace