diff --git a/build-constraints.yaml b/build-constraints.yaml
index cb5e2455..5455634c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2049,7 +2049,7 @@ packages:
         - burrito
         - derulo
         - flow
-        - github-release
+        - github-release < 0 # optparse-applicative 0.16.1
         - json-feed
         # - lackey # servant
         - list-singleton
@@ -3082,7 +3082,7 @@ packages:
         - antiope-sns < 0 # ghc 8.10 via amazonka
         - antiope-sqs < 0 # ghc 8.10 via amazonka
         - arbor-lru-cache
-        - arbor-postgres
+        - arbor-postgres < 0 # optparse-applicative 0.16.1
         - asif
         - avro
         - bits-extra
@@ -3670,7 +3670,7 @@ packages:
         - proto-lens
         # disabled due to QuickCheck < 2.14
         # - proto-lens-arbitrary
-        - proto-lens-optparse
+        - proto-lens-optparse < 0 # optparse-applicative 0.16.1
         - tensorflow-test
         - pier-core < 0
         - pier < 0
@@ -3763,7 +3763,7 @@ packages:
         - colourista
         - first-class-patterns
         - ilist
-        - life-sync
+        - life-sync < 0 # optparse-applicative 0.16.1
         - membrain
         - relude < 1  # cabal version/parsing issue: https://github.com/commercialhaskell/stackage/issues/5921
         - shellmet
@@ -4344,7 +4344,7 @@ packages:
     "Brandon Chinn <brandon@leapyear.io> @brandon-leapyear":
         - aeson-schemas
         - github-rest
-        - graphql-client
+        - graphql-client < 0 # optparse-applicative 0.16.1
         - hpc-lcov
         - th-test-utils
 
@@ -6804,11 +6804,6 @@ packages:
       # https://github.com/commercialhaskell/stackage/issues/5593
       - proto3-wire < 1.2
 
-      # https://github.com/commercialhaskell/stackage/issues/5597
-      - optparse-applicative < 0.16
-      - optparse-generic < 1.4
-      - turtle < 1.5.21
-
       # https://github.com/commercialhaskell/stackage/issues/5598
       - base64-bytestring < 1.2