diff --git a/etc/teams.scm b/etc/teams.scm
index c1822fe881d..e2bc250028f 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -300,11 +300,7 @@ asdf-build-system."
   (team 'go
         #:name "Go team"
         #:scope (list "gnu/packages/configuration-management.scm"
-                      "gnu/packages/golang-check.scm"
-                      "gnu/packages/golang-crypto.scm"
-                      "gnu/packages/golang-web.scm"
-                      "gnu/packages/golang-xyz.scm"
-                      "gnu/packages/golang.scm"
+                      "gnu/packages/golang(-.+|)\\.scm$"
                       "gnu/packages/syncthing.scm"
                       "gnu/packages/terraform.scm"
                       "guix/build-system/go.scm"