diff --git a/build-constraints.yaml b/build-constraints.yaml
index 072e3040..fafebffe 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2934,8 +2934,8 @@ packages:
         - antiope-sns
         - antiope-sqs
         - arbor-lru-cache
-        - arbor-postgres
-        - asif
+        - arbor-postgres < 0 # generic-lens 2.0.0.0
+        - asif < 0 # hw-ip due to generic-lens 2.0.0.0
         - avro
         - bits-extra
         - hw-balancedparens
@@ -2943,28 +2943,28 @@ packages:
         - hw-conduit
         - hw-conduit-merges
         - hw-diagnostics
-        - hw-dsv
-        - hw-eliasfano
+        - hw-dsv < 0 # generic-lens 2.0.0.0
+        - hw-eliasfano < 0 # generic-lens 2.0.0.0
         - hw-excess
         - hw-fingertree
         - hw-fingertree-strict
         - hw-hedgehog
         - hw-hspec-hedgehog
         - hw-int
-        - hw-ip
-        - hw-json
-        - hw-json-simple-cursor
-        - hw-json-standard-cursor
+        - hw-ip < 0 # generic-lens 2.0.0.0
+        - hw-json < 0 # generic-lens 2.0.0.0
+        - hw-json-simple-cursor < 0 # generic-lens 2.0.0.0
+        - hw-json-standard-cursor < 0 # generic-lens 2.0.0.0
         - hw-mquery
-        - hw-packed-vector
+        - hw-packed-vector < 0 # generic-lens 2.0.0.0
         - hw-parser
         - hw-prim
-        - hw-rankselect
+        - hw-rankselect < 0 # generic-lens 2.0.0.0
         - hw-rankselect-base
-        - hw-simd
+        - hw-simd < 0 # hw-rankselect due to generic-lens 2.0.0.0
         - hw-streams
-        - hw-succinct
-        - hw-xml
+        - hw-succinct < 0 # hw-rankselect due to generic-lens 2.0.0.0
+        - hw-xml < 0 # generic-lens 2.0.0.0
 
     "George Wilson <george@wils.online> @gwils":
         - hedgehog-fn
@@ -3713,7 +3713,9 @@ packages:
         - milena < 0
 
     "Csongor Kiss <kiss.csongor.kiss@gmail.com> @kcsongor":
-        - generic-lens < 2.0.0.0 # https://github.com/commercialhaskell/stackage/issues/5161
+        - generic-lens
+        - generic-optics
+        - generic-lens-core
 
     "Bogdan Neterebskii <bog2dan1@gmail.com> @ozzzzz":
         - cast