diff --git a/build-constraints.yaml b/build-constraints.yaml
index d323e8ae..d6015603 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1,4 +1,4 @@
-ghc-major-version: "8.0"
+sghc-major-version: "8.0"
 # Constraints for brand new builds
 packages:
     "Marco Zocca @ocramz":
@@ -82,7 +82,7 @@ packages:
         - persistent-postgresql
         - persistent-sqlite
         - persistent-template
-        # - stackage-curator # BLOCKED amazonka-core
+        - stackage-curator
         - stm-conduit
         - wai-websockets
         - warp-tls
@@ -1091,79 +1091,78 @@ packages:
         - jose-jwt
 
     "Brendan Hay <brendan.g.hay@gmail.com> @brendanhay":
-        # BLOCKED http-conduit 2.2
-        # - amazonka
-        # - amazonka-core
-        # - amazonka-test
-        # - amazonka-apigateway
-        # - amazonka-application-autoscaling
-        # - amazonka-autoscaling
-        # - amazonka-certificatemanager
-        # - amazonka-cloudformation
-        # - amazonka-cloudfront
-        # - amazonka-cloudhsm
-        # - amazonka-cloudsearch-domains
-        # - amazonka-cloudsearch
-        # - amazonka-cloudtrail
-        # - amazonka-cloudwatch-events
-        # - amazonka-cloudwatch-logs
-        # - amazonka-cloudwatch
-        # - 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-streams
-        # - amazonka-dynamodb
-        # - amazonka-ec2
-        # - amazonka-ecr
-        # - amazonka-ecs
-        # - amazonka-efs
-        # - amazonka-elasticache
-        # - amazonka-elasticbeanstalk
-        # - amazonka-elasticsearch
-        # - amazonka-elastictranscoder
-        # - amazonka-elb
-        # - amazonka-emr
-        # - amazonka-gamelift
-        # - amazonka-glacier
-        # - amazonka-iam
-        # - amazonka-importexport
-        # - amazonka-inspector
-        # - amazonka-iot-dataplane
-        # - amazonka-iot
-        # - amazonka-kinesis
-        # - amazonka-kinesis-firehose
-        # - amazonka-kms
-        # - amazonka-lambda
-        # - amazonka-marketplace-analytics
-        # - amazonka-marketplace-metering
-        # - amazonka-ml
-        # - amazonka-opsworks
-        # - amazonka-rds
-        # - amazonka-redshift
-        # - amazonka-route53-domains
-        # - amazonka-route53
-        # - amazonka-s3
-        # - amazonka-sdb
-        # - amazonka-ses
-        # - amazonka-sns
-        # - amazonka-sqs
-        # - amazonka-ssm
-        # - amazonka-storagegateway
-        # - amazonka-sts
-        # - amazonka-support
-        # - amazonka-swf
-        # - amazonka-waf
-        # - amazonka-workspaces
+        - amazonka
+        - amazonka-core
+        - amazonka-test
+        - amazonka-apigateway
+        - amazonka-application-autoscaling
+        - amazonka-autoscaling
+        - amazonka-certificatemanager
+        - amazonka-cloudformation
+        - amazonka-cloudfront
+        - amazonka-cloudhsm
+        - amazonka-cloudsearch-domains
+        - amazonka-cloudsearch
+        - amazonka-cloudtrail
+        - amazonka-cloudwatch-events
+        - amazonka-cloudwatch-logs
+        - amazonka-cloudwatch
+        - 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-streams
+        - amazonka-dynamodb
+        - amazonka-ec2
+        - amazonka-ecr
+        - amazonka-ecs
+        - amazonka-efs
+        - amazonka-elasticache
+        - amazonka-elasticbeanstalk
+        - amazonka-elasticsearch
+        - amazonka-elastictranscoder
+        - amazonka-elb
+        - amazonka-emr
+        - amazonka-gamelift
+        - amazonka-glacier
+        - amazonka-iam
+        - amazonka-importexport
+        - amazonka-inspector
+        - amazonka-iot-dataplane
+        - amazonka-iot
+        - amazonka-kinesis
+        - amazonka-kinesis-firehose
+        - amazonka-kms
+        - amazonka-lambda
+        - amazonka-marketplace-analytics
+        - amazonka-marketplace-metering
+        - amazonka-ml
+        - amazonka-opsworks
+        - amazonka-rds
+        - amazonka-redshift
+        - amazonka-route53-domains
+        - amazonka-route53
+        - amazonka-s3
+        - amazonka-sdb
+        - amazonka-ses
+        - amazonka-sns
+        - amazonka-sqs
+        - amazonka-ssm
+        - amazonka-storagegateway
+        - amazonka-sts
+        - amazonka-support
+        - amazonka-swf
+        - amazonka-waf
+        - amazonka-workspaces
         # - gogol # https://github.com/brendanhay/gogol/issues/38
         - gogol-core
         - gogol-adexchange-buyer
@@ -1501,7 +1500,7 @@ packages:
     "Daniel Patterson <dbp@dbpmail.net> @dbp":
         # via digestive-functors - hspec-snap
         - hworker
-        # - hworker-ses BLOCKED amazonka-core
+        - hworker-ses
         - fn
         # via heist - fn-extra
 
@@ -2553,9 +2552,10 @@ packages:
 
     "XT <e@xtendo.org> @xtendo-org":
         - rawfilepath
+
     "Konstantin Zudov <co@zudov.me> @zudov":
         - html-email-validate
-        
+
     "Carl Baatz <carl.baatz@gmail.com> @cbaatz":
         - atom-basic