diff --git a/CODEOWNERS b/CODEOWNERS
index f09d4747ae3..762f95ed4ad 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -127,6 +127,14 @@ 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/gnupg\.scm                            @guix/crypto
+gnu/packages/nettle\.scm                           @guix/crypto
+gnu/packages/password-utils\.scm                   @guix/crypto
+gnu/packages/security-token\.scm                   @guix/crypto
+gnu/packages/ssh\.scm                              @guix/crypto
+gnu/packages/tls\.scm                              @guix/crypto
+
 gnu/packages/debian\.scm                           @guix/debian
 
 \.texi$                                            @guix/documentation
diff --git a/etc/teams.scm b/etc/teams.scm
index 2f3bd5fcb8b..7750e46af94 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -956,6 +956,20 @@ release."
                       "guix/scripts/import/crate.scm"
                       "tests/import/crate.scm")))
 
+(define-team crypto
+  (team 'crypto
+        #: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")))
+
 (define-team science
   (team 'science
         #:name "Science team"
@@ -1294,7 +1308,7 @@ the \"texlive\" importer."
 (define-member (person "Cayetano Santos"
                        "csantosb@inventati.org"
                        "csantosb")
-  ai emacs electronics hpc)
+  ai emacs electronics hpc crypto)
 
 (define-member (person "Greg Hogan"
                        "code@greghogan.com"