diff --git a/CODEOWNERS b/CODEOWNERS
index edd88b5b07f..da3e644b5a0 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -129,7 +129,7 @@ guix/build/gnu-build-system\.scm                   @guix/core-packages
 guix/build/utils\.scm                              @guix/core-packages
 guix/build-system/gnu\.scm                         @guix/core-packages
 
-gnu/packages/crypto\.scm                           @guix/crypto
+gnu/packages/(.*-|)crypto\.scm$                    @guix/crypto
 gnu/packages/gnupg\.scm                            @guix/crypto
 gnu/packages/nettle\.scm                           @guix/crypto
 gnu/packages/password-utils\.scm                   @guix/crypto
diff --git a/etc/teams.scm b/etc/teams.scm
index c3fae846923..a5cdbf3e296 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -977,14 +977,13 @@ release."
         #:name "Crypto team"
         #:description
         "Secrets, passwords, cryptography and security related packages."
-        #:scope (list
-                 "gnu/packages/crypto.scm"
-                 "gnu/packages/gnupg.scm"
-                 "gnu/packages/nettle.scm"
-                 "gnu/packages/password-utils.scm"
-                 "gnu/packages/security-token.scm"
-                 "gnu/packages/ssh.scm"
-                 "gnu/packages/tls.scm")))
+        #:scope (list (make-regexp* "^gnu/packages/(.*-|)crypto\\.scm$")
+                      "gnu/packages/gnupg.scm"
+                      "gnu/packages/nettle.scm"
+                      "gnu/packages/password-utils.scm"
+                      "gnu/packages/security-token.scm"
+                      "gnu/packages/ssh.scm"
+                      "gnu/packages/tls.scm")))
 
 (define-team science
   (team 'science