diff --git a/overrides/build-systems.json b/overrides/build-systems.json
index 64b3c61..ecf5168 100644
--- a/overrides/build-systems.json
+++ b/overrides/build-systems.json
@@ -5690,6 +5690,9 @@
   "flask-cors": [
     "setuptools"
   ],
+  "flask-discord-interactions": [
+    "setuptools"
+  ],
   "flask-elastic": [
     "setuptools"
   ],
@@ -16585,7 +16588,22 @@
     "setuptools"
   ],
   "service-identity": [
-    "setuptools"
+    {
+      "buildSystem": "setuptools",
+      "until": "23.1.0"
+    },
+    {
+      "buildSystem": "hatchling",
+      "from": "23.1.0"
+    },
+    {
+      "buildSystem": "hatch-vcs",
+      "from": "23.1.0"
+    },
+    {
+      "buildSystem": "hatch-fancy-pypi-readme",
+      "from": "23.1.0"
+    }
   ],
   "setproctitle": [
     "setuptools"
diff --git a/overrides/default.nix b/overrides/default.nix
index d04ac7b..e9a853e 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -771,7 +771,8 @@ lib.composeManyExtensions [
 
       gunicorn = super.gunicorn.overridePythonAttrs (old: {
         # actually needs setuptools as a runtime dependency
-        propagatedBuildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ];
+        # 21.0.0 starts transition away from runtime dependency, starting with packaging
+        propagatedBuildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools self.packaging ];
       });
 
       h3 = super.h3.overridePythonAttrs (