diff --git a/build-constraints.yaml b/build-constraints.yaml
index 0a47eb07..2b204087 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1317,17 +1317,26 @@ packages:
         - alarmclock
         - bank-holidays-england
 
-    "Haskell Servant <jkarni@gmail.com>":
+    "Haskell Servant <haskell-servant-maintainers@googlegroups.com>":
         - servant
-        - servant-client
-        - servant-docs
-        - servant-js
-        - servant-server
-        - servant-lucid
         - servant-blaze
-        - servant-foreign
-        - servant-mock
         - servant-cassava
+        - servant-client
+        - servant-client-core
+        - servant-conduit
+        - servant-docs
+        - servant-foreign
+        - servant-http-streams
+        - servant-js
+        - servant-lucid
+        - servant-machines
+        - servant-mock
+        - servant-multipart
+        - servant-pipes
+        - servant-server
+        - servant-swagger
+        - servant-swagger-ui
+        - servant-swagger-ui-core
 
     "Alexandr Ruchkin <voidex@live.com> @mvoidex":
         - hformat
@@ -2404,7 +2413,6 @@ packages:
     "Nickolay Kudasov <nickolay.kudasov@gmail.com> @fizruk":
         - http-api-data
         - swagger2
-        - servant-swagger
         - telegram-bot-simple < 0 # https://github.com/fizruk/telegram-bot-simple/issues/18
 
     "Jared Tobin <jared@jtobin.ca> @jtobin":