diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8b374c1f..5f431e89 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1902,103 +1902,104 @@ packages:
         - amazonka-waf
         - amazonka-workspaces
         - amazonka-xray
-        - gogol
-        - gogol-core < 0  # https://github.com/commercialhaskell/stackage/issues/6089
-        - 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
+        # gogol-* disabled due to `gogol-core` due to `servant`: https://github.com/commercialhaskell/stackage/issues/6089
+        # gogol
+        # 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
         - pagerduty < 0 # build failure with GHC 8.4 https://github.com/brendanhay/pagerduty/issues/10
         - semver