diff --git a/CODEOWNERS b/CODEOWNERS
index 05fe4f8dcf..d90303c439 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -132,6 +132,7 @@ guix/build/utils\.scm                              @guix/core-packages
 guix/build-system/gnu\.scm                         @guix/core-packages
 
 gnu/packages/(.*-|)crypto\.scm$                    @guix/crypto
+gnu/packages/cryptsetup\.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 076d359ebd..408f3f71f2 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -1002,6 +1002,7 @@ release."
         #:description
         "Secrets, passwords, cryptography and security related packages."
         #:scope (list (make-regexp* "^gnu/packages/(.*-|)crypto\\.scm$")
+                      "gnu/packages/cryptsetup.scm"
                       "gnu/packages/gnupg.scm"
                       "gnu/packages/nettle.scm"
                       "gnu/packages/password-utils.scm"