diff --git a/build-constraints.yaml b/build-constraints.yaml
index ddf11310..fe933b3c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -722,7 +722,7 @@ packages:
         - windns
 
         - mono-traversable
-        - http-client
+        - http-client < 0.7 # https://github.com/commercialhaskell/stackage/issues/5747
         - http-conduit
         - githash
 
@@ -1763,6 +1763,196 @@ packages:
         - jose-jwt
 
     "Brendan Hay <brendan.g.hay@gmail.com> @brendanhay":
+        - amazonka < 0 # ghc 8.10 via unliftio-core
+        - amazonka-core
+        - amazonka-test
+        - amazonka-apigateway
+        - amazonka-application-autoscaling
+        - amazonka-appstream
+        - amazonka-athena
+        - amazonka-autoscaling
+        - amazonka-budgets
+        - amazonka-certificatemanager
+        - amazonka-cloudformation
+        - amazonka-cloudfront
+        - amazonka-cloudhsm
+        - amazonka-cloudsearch
+        - amazonka-cloudsearch-domains
+        - amazonka-cloudtrail
+        - amazonka-cloudwatch
+        - amazonka-cloudwatch-events
+        - amazonka-cloudwatch-logs
+        - amazonka-codebuild
+        - amazonka-codecommit
+        - amazonka-codedeploy
+        - amazonka-codepipeline
+        - amazonka-cognito-identity
+        - amazonka-cognito-idp
+        - amazonka-cognito-sync
+        - amazonka-config
+        - amazonka-datapipeline
+        - amazonka-devicefarm
+        - amazonka-directconnect
+        - amazonka-discovery
+        - amazonka-dms
+        - amazonka-ds
+        - amazonka-dynamodb
+        - amazonka-dynamodb-streams
+        # - amazonka-ec2 # https://github.com/brendanhay/amazonka/issues/549
+        - amazonka-ecr
+        - amazonka-ecs
+        - amazonka-efs
+        - amazonka-elasticache
+        - amazonka-elasticbeanstalk
+        - amazonka-elasticsearch
+        - amazonka-elastictranscoder
+        - amazonka-elb
+        - amazonka-elbv2
+        - amazonka-emr
+        - amazonka-gamelift
+        - amazonka-glacier
+        - amazonka-glue
+        - amazonka-health
+        - amazonka-iam
+        - amazonka-importexport
+        - amazonka-inspector
+        - amazonka-iot
+        - amazonka-iot-dataplane
+        - amazonka-kinesis
+        - amazonka-kinesis-analytics
+        - amazonka-kinesis-firehose
+        - amazonka-kms
+        - amazonka-lambda
+        - amazonka-lightsail
+        - amazonka-marketplace-analytics
+        - amazonka-marketplace-metering
+        - amazonka-ml
+        - amazonka-opsworks
+        - amazonka-opsworks-cm
+        - amazonka-pinpoint
+        - amazonka-polly
+        - amazonka-rds
+        - amazonka-redshift
+        - amazonka-rekognition
+        - amazonka-route53
+        - amazonka-route53-domains
+        - amazonka-s3
+        - amazonka-sdb
+        - amazonka-servicecatalog
+        - amazonka-ses
+        - amazonka-shield
+        - amazonka-sms
+        - amazonka-snowball
+        - amazonka-sns
+        - amazonka-sqs
+        - amazonka-ssm
+        - amazonka-stepfunctions
+        - amazonka-storagegateway
+        - amazonka-sts
+        - amazonka-support
+        - amazonka-swf
+        - amazonka-waf
+        - amazonka-workspaces
+        - amazonka-xray
+        # - gogol # fails to build due to conduit 1.3, servant 0.13
+        # - gogol-core
+        # - gogol-adexchange-buyer
+        # - gogol-adexchange-seller
+        # - gogol-admin-datatransfer
+        # - gogol-admin-directory
+        # - gogol-admin-emailmigration
+        # - gogol-admin-reports
+        # - gogol-adsense
+        # - gogol-adsense-host
+        # - gogol-affiliates
+        # - gogol-analytics
+        # - gogol-android-enterprise
+        # - gogol-android-publisher
+        # - gogol-appengine
+        # - gogol-apps-activity
+        # - gogol-apps-calendar
+        # - gogol-apps-licensing
+        # - gogol-apps-reseller
+        # - gogol-apps-tasks
+        # - gogol-appstate
+        # - gogol-autoscaler
+        # - gogol-bigquery
+        # - gogol-billing
+        # - gogol-blogger
+        # - gogol-books
+        # - gogol-civicinfo
+        # - gogol-classroom
+        # - gogol-cloudmonitoring
+        # - gogol-cloudtrace
+        # - gogol-compute
+        # - gogol-container
+        # - gogol-customsearch
+        # - gogol-dataflow
+        # - gogol-dataproc
+        # - gogol-datastore
+        # - gogol-debugger
+        # - gogol-deploymentmanager
+        # - gogol-dfareporting
+        # - gogol-discovery
+        # - gogol-dns
+        # - gogol-doubleclick-bids
+        # - gogol-doubleclick-search
+        # - gogol-drive
+        # - gogol-firebase-rules
+        # - gogol-fitness
+        # - gogol-fonts
+        # - gogol-freebasesearch
+        # - gogol-fusiontables
+        # - gogol-games
+        # - gogol-games-configuration
+        # - gogol-games-management
+        # - gogol-genomics
+        # - gogol-gmail
+        # - gogol-groups-migration
+        # - gogol-groups-settings
+        # - gogol-identity-toolkit
+        # - gogol-kgsearch
+        # - gogol-latencytest
+        # - gogol-logging
+        # - gogol-maps-coordinate
+        # - gogol-maps-engine
+        # - gogol-mirror
+        # - gogol-monitoring
+        # - gogol-oauth2
+        # - gogol-pagespeed
+        # - gogol-partners
+        # - gogol-people
+        # - gogol-play-moviespartner
+        # - gogol-plus
+        # - gogol-plus-domains
+        # - gogol-prediction
+        # - gogol-proximitybeacon
+        # - gogol-pubsub
+        # - gogol-qpxexpress
+        # - gogol-replicapool
+        # - gogol-replicapool-updater
+        # - gogol-resourcemanager
+        # - gogol-resourceviews
+        # - gogol-script
+        # - gogol-sheets
+        # - gogol-shopping-content
+        # - gogol-siteverification
+        # - gogol-spectrum
+        # - gogol-sqladmin
+        # - gogol-storage
+        # - gogol-storage-transfer
+        # - gogol-tagmanager
+        # - gogol-taskqueue
+        # - gogol-translate
+        # - gogol-urlshortener
+        # - gogol-useraccounts
+        # - gogol-vision
+        # - gogol-webmaster-tools
+        # - gogol-youtube
+        # - gogol-youtube-analytics
+        # - gogol-youtube-reporting
+        # - ede # https://github.com/brendanhay/ede/issues/28
+        - pagerduty < 0 # build failure with GHC 8.4 https://github.com/brendanhay/pagerduty/issues/10
         - semver
         - text-manipulate
 
@@ -3759,7 +3949,7 @@ packages:
 
     "Alexey Kotlyarov <a@koterpillar.com> @koterpillar":
         - appendmap
-        - serverless-haskell < 0 # via amazonka-*, https://github.com/commercialhaskell/stackage/issues/5572
+        - serverless-haskell
 
     "Guru Devanla <grdvnl@gmail.com> @gdevanla":
         - pptable