diff --git a/CODEOWNERS b/CODEOWNERS
index cd2bbd985d..1df56be42c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -405,7 +405,7 @@ gnu/packages/antivirus\.scm                        @guix/sysadmin
 gnu/packages/apparmor\.scm                         @guix/sysadmin
 gnu/packages/authentication\.scm                   @guix/sysadmin
 gnu/packages/cluster\.scm                          @guix/sysadmin
-gnu/packages/configuration-management              @guix/sysadmin
+gnu/packages/configuration-management\.scm         @guix/sysadmin
 gnu/packages/databases\.scm                        @guix/sysadmin
 gnu/packages/distributed\.scm                      @guix/sysadmin
 gnu/packages/dns\.scm                              @guix/sysadmin
@@ -425,6 +425,25 @@ gnu/packages/task-runners\.scm                     @guix/sysadmin
 gnu/packages/terraform\.scm                        @guix/sysadmin
 gnu/packages/virtualization\.scm                   @guix/sysadmin
 gnu/packages/vnc\.scm                              @guix/sysadmin
+gnu/services/admin\.scm                            @guix/sysadmin
+gnu/services/authentication\.scm                   @guix/sysadmin
+gnu/services/databases\.scm                        @guix/sysadmin
+gnu/services/dns\.scm                              @guix/sysadmin
+gnu/services/high-availability\.scm                @guix/sysadmin
+gnu/services/kerberos\.scm                         @guix/sysadmin
+gnu/services/monitoring\.scm                       @guix/sysadmin
+gnu/services/nfs\.scm                              @guix/sysadmin
+gnu/services/samba\.scm                            @guix/sysadmin
+gnu/services/virtualization\.scm                   @guix/sysadmin
+gnu/services/vnc\.scm                              @guix/sysadmin
+gnu/tests/databases\.scm                           @guix/sysadmin
+gnu/tests/dns\.scm                                 @guix/sysadmin
+gnu/tests/high-availability\.scm                   @guix/sysadmin
+gnu/tests/monitoring\.scm                          @guix/sysadmin
+gnu/tests/nfs\.scm                                 @guix/sysadmin
+gnu/tests/samba\.scm                               @guix/sysadmin
+gnu/tests/virtualization\.scm                      @guix/sysadmin
+gnu/tests/vnc\.scm                                 @guix/sysadmin
 
 gnu/build/jami-service\.scm                        @guix/telephony
 gnu/packages/jami\.scm                             @guix/telephony
diff --git a/etc/teams.scm b/etc/teams.scm
index 294ebaa48e..55e8dccbfb 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -1099,7 +1099,7 @@ packages (e.g. Astronomy, Chemistry, Math, Physics etc.)"
                       "gnu/packages/apparmor.scm"
                       "gnu/packages/authentication.scm"
                       "gnu/packages/cluster.scm"
-                      "gnu/packages/configuration-management"
+                      "gnu/packages/configuration-management.scm"
                       "gnu/packages/databases.scm"
                       "gnu/packages/distributed.scm"
                       "gnu/packages/dns.scm"
@@ -1118,7 +1118,26 @@ packages (e.g. Astronomy, Chemistry, Math, Physics etc.)"
                       "gnu/packages/task-runners.scm"
                       "gnu/packages/terraform.scm"
                       "gnu/packages/virtualization.scm"
-                      "gnu/packages/vnc.scm")))
+                      "gnu/packages/vnc.scm"
+                      "gnu/services/admin.scm"
+                      "gnu/services/authentication.scm"
+                      "gnu/services/databases.scm"
+                      "gnu/services/dns.scm"
+                      "gnu/services/high-availability.scm"
+                      "gnu/services/kerberos.scm"
+                      "gnu/services/monitoring.scm"
+                      "gnu/services/nfs.scm"
+                      "gnu/services/samba.scm"
+                      "gnu/services/virtualization.scm"
+                      "gnu/services/vnc.scm"
+                      "gnu/tests/databases.scm"
+                      "gnu/tests/dns.scm"
+                      "gnu/tests/high-availability.scm"
+                      "gnu/tests/monitoring.scm"
+                      "gnu/tests/nfs.scm"
+                      "gnu/tests/samba.scm"
+                      "gnu/tests/virtualization.scm"
+                      "gnu/tests/vnc.scm")))
 
 (define-team telephony
   (team 'telephony