diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6d91316c..3bea0d78 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['9.4', '9.6']
+        ghc: ['9.4', '9.6', '9.8']
         os:  [ubuntu-latest]
     steps:
     - uses: actions/checkout@v4
@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['9.4', '9.6']
+        ghc: ['9.4', '9.6', '9.8']
         os:  [ubuntu-latest]
         project:
         - aws-checkip
diff --git a/source-constraints/src/SourceConstraints.hs b/source-constraints/src/SourceConstraints.hs
index 5a336279..1fc322c2 100644
--- a/source-constraints/src/SourceConstraints.hs
+++ b/source-constraints/src/SourceConstraints.hs
@@ -186,6 +186,9 @@ mkWarnMsg :: DiagOpts -> SrcSpan -> PrintUnqualified -> SDoc -> Message
 mkWarnMsg diagOpts srcSpan printUnqualified sdoc
   = MsgEnvelope
   { errMsgContext    = printUnqualified
+#if MIN_VERSION_base(4,19,0)
+  , errMsgReason     = ResolvedDiagnosticReason WarningWithoutFlag
+#endif
   , errMsgDiagnostic = ghcUnknownMessage $ mkPlainDiagnostic WarningWithoutFlag [] sdoc
   , errMsgSeverity   = (diagReasonSeverity diagOpts WarningWithoutFlag)
   , errMsgSpan       = srcSpan
diff --git a/source-constraints/test/Spec.hs b/source-constraints/test/Spec.hs
index 0b21a33f..ddf53619 100644
--- a/source-constraints/test/Spec.hs
+++ b/source-constraints/test/Spec.hs
@@ -116,7 +116,9 @@ getWarnings file = runGhc (pure libdir) $ do
     render sDocContext warning = do
       caretDiagnostic <- liftIO $
         getCaretDiagnostic
-#if MIN_VERSION_base(4,18,0)
+#if MIN_VERSION_base(4,19,0)
+            (MCDiagnostic (errMsgSeverity warning) (ResolvedDiagnosticReason WarningWithoutFlag) Nothing)
+#elif MIN_VERSION_base(4,18,0)
             (MCDiagnostic (errMsgSeverity warning) WarningWithoutFlag Nothing)
 #else
             (MCDiagnostic (errMsgSeverity warning) WarningWithoutFlag)
@@ -126,7 +128,11 @@ getWarnings file = runGhc (pure libdir) $ do
 
       pure $ renderWithContext
         sDocContext
-#if MIN_VERSION_base(4,18,0)
+#if MIN_VERSION_base(4,19,0)
+          (formatBulleted
+            (diagnosticMessage (defaultDiagnosticOpts @GhcMessage) $ errMsgDiagnostic warning) $+$ caretDiagnostic
+          )
+#elif MIN_VERSION_base(4,18,0)
           (formatBulleted
             sDocContext
             (diagnosticMessage (defaultDiagnosticOpts @GhcMessage) $ errMsgDiagnostic warning) $+$ caretDiagnostic
diff --git a/stack-9.8.yaml b/stack-9.8.yaml
new file mode 100644
index 00000000..b01bc655
--- /dev/null
+++ b/stack-9.8.yaml
@@ -0,0 +1,106 @@
+resolver: lts-23.0
+extra-deps:
+- mprelude
+- github: mbj/stratosphere
+  commit: d1b638820ca9fd90f7d5afba535415da47252af5
+  subdirs:
+  - .
+  - services/cloudwatch
+  - services/ecs
+  - services/events
+  - services/iam
+  - services/lambda
+  - services/logs
+  - services/s3
+  - services/secretsmanager
+- github: brendanhay/amazonka
+  commit: 30b200d487bccd2568de1257a812a464270d0096
+  subdirs:
+  - lib/amazonka
+  - lib/amazonka-core
+  - lib/services/amazonka-cloudformation
+  - lib/services/amazonka-ec2
+  - lib/services/amazonka-lambda
+  - lib/services/amazonka-s3
+  - lib/services/amazonka-secretsmanager
+  - lib/services/amazonka-sso
+  - lib/services/amazonka-sts
+flags:
+  aws-checkip:
+    development: true
+  aws-rds:
+    development: true
+  aws-secrets:
+    development: true
+  aws-temporary-ingress-rule:
+    development: true
+  bounded:
+    development: true
+  cbt:
+    development: true
+  cli-utils:
+    development: true
+  conversions:
+    development: true
+  dbt:
+    development: true
+  devtools:
+    development: true
+  http-mclient:
+    development: true
+  lambda-alb:
+    development: true
+  lambda-runtime:
+    development: true
+  lht:
+    development: true
+  mio-amazonka:
+    development: true
+  mio-core:
+    development: true
+  mio-log:
+    development: true
+  mprelude:
+    development: true
+  oauth:
+    development: true
+  openapi:
+    development: true
+  pgt:
+    development: true
+  source-constraints:
+    development: true
+  stack-deploy:
+    development: true
+  tasty-mgolden:
+    development: true
+  work-pool:
+    development: true
+  xray:
+    development: true
+packages:
+- aws-checkip
+- aws-rds
+- aws-secrets
+- aws-temporary-ingress-rule
+- bounded
+- cbt
+- cli-utils
+- conversions
+- dbt
+- devtools
+- http-mclient
+- lambda-alb
+- lambda-runtime
+- lht
+- mio-amazonka
+- mio-core
+- mio-log
+- oauth
+- openapi
+- pgt
+- source-constraints
+- stack-deploy
+- tasty-mgolden
+- work-pool
+- xray
diff --git a/stack-9.8.yaml.lock b/stack-9.8.yaml.lock
new file mode 100644
index 00000000..2dace79d
--- /dev/null
+++ b/stack-9.8.yaml.lock
@@ -0,0 +1,246 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages:
+- completed:
+    name: stratosphere
+    pantry-tree:
+      sha256: 9461aaaf7e8baccf8d129720126179caaee6420d56e34152154689f4c2d847ae
+      size: 1526810
+    sha256: 74ab541d3bfa92fac0c8cda380f3fe2de4cb37dafd78b5c9f2506744d53f36d3
+    size: 2937014
+    subdir: .
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+    version: 1.0.0
+  original:
+    subdir: .
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+- completed:
+    name: stratosphere-cloudwatch
+    pantry-tree:
+      sha256: bc872304641517499210bdbd2db774c4c450e54ccd15b66bcd593ee9cd629c60
+      size: 4353
+    sha256: 74ab541d3bfa92fac0c8cda380f3fe2de4cb37dafd78b5c9f2506744d53f36d3
+    size: 2937014
+    subdir: services/cloudwatch
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+    version: 1.0.0
+  original:
+    subdir: services/cloudwatch
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+- completed:
+    name: stratosphere-ecs
+    pantry-tree:
+      sha256: 6dbadbe1590fc976c5cde85f0cb18e57e2a0bae958ff447d3e557018d099dfa8
+      size: 13226
+    sha256: 74ab541d3bfa92fac0c8cda380f3fe2de4cb37dafd78b5c9f2506744d53f36d3
+    size: 2937014
+    subdir: services/ecs
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+    version: 1.0.0
+  original:
+    subdir: services/ecs
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+- completed:
+    name: stratosphere-events
+    pantry-tree:
+      sha256: a217cd6621badf38605e09ce7497709aa4f0a5652bf3c7f58bac329e82438fcf
+      size: 8137
+    sha256: 74ab541d3bfa92fac0c8cda380f3fe2de4cb37dafd78b5c9f2506744d53f36d3
+    size: 2937014
+    subdir: services/events
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+    version: 1.0.0
+  original:
+    subdir: services/events
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+- completed:
+    name: stratosphere-iam
+    pantry-tree:
+      sha256: da1e34b72e68f1aef0fbca8680ed1c623def45c6ed2feac25815933d17c86dcb
+      size: 1815
+    sha256: 74ab541d3bfa92fac0c8cda380f3fe2de4cb37dafd78b5c9f2506744d53f36d3
+    size: 2937014
+    subdir: services/iam
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+    version: 1.0.0
+  original:
+    subdir: services/iam
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+- completed:
+    name: stratosphere-lambda
+    pantry-tree:
+      sha256: 1e554f32ec0f522724f15185d7f1c714f39c40e72a4b533c1aae4ca6b309a7dc
+      size: 8043
+    sha256: 74ab541d3bfa92fac0c8cda380f3fe2de4cb37dafd78b5c9f2506744d53f36d3
+    size: 2937014
+    subdir: services/lambda
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+    version: 1.0.0
+  original:
+    subdir: services/lambda
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+- completed:
+    name: stratosphere-logs
+    pantry-tree:
+      sha256: 9ec2b117d4ea936052e9756fcfcfcb4b804ca52cfb4ada53500b8fd2ef53f72e
+      size: 1083
+    sha256: 74ab541d3bfa92fac0c8cda380f3fe2de4cb37dafd78b5c9f2506744d53f36d3
+    size: 2937014
+    subdir: services/logs
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+    version: 1.0.0
+  original:
+    subdir: services/logs
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+- completed:
+    name: stratosphere-s3
+    pantry-tree:
+      sha256: 25ea8cac5e9c4400b433f3ff8b2d26174b0ae3e78db8b03f3f9cdf24737620a7
+      size: 16418
+    sha256: 74ab541d3bfa92fac0c8cda380f3fe2de4cb37dafd78b5c9f2506744d53f36d3
+    size: 2937014
+    subdir: services/s3
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+    version: 1.0.0
+  original:
+    subdir: services/s3
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+- completed:
+    name: stratosphere-secretsmanager
+    pantry-tree:
+      sha256: 2fee0eb9db2c3d6b02bf0eada7ed492f28c1bde89ad4383af3ccd2292f7e6e6d
+      size: 1408
+    sha256: 74ab541d3bfa92fac0c8cda380f3fe2de4cb37dafd78b5c9f2506744d53f36d3
+    size: 2937014
+    subdir: services/secretsmanager
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+    version: 1.0.0
+  original:
+    subdir: services/secretsmanager
+    url: https://github.com/mbj/stratosphere/archive/d1b638820ca9fd90f7d5afba535415da47252af5.tar.gz
+- completed:
+    name: amazonka
+    pantry-tree:
+      sha256: 449e5e0777359ebb56ead5fca6aeef5ec4f5bdd82a810ad3ba30432055efaa8b
+      size: 1528
+    sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3
+    size: 34732287
+    subdir: lib/amazonka
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/amazonka
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+- completed:
+    name: amazonka-core
+    pantry-tree:
+      sha256: e560d220c73068da280e8532d27f4cee341c2c05efd2f5d5b1b0336cb24ccb1b
+      size: 3222
+    sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3
+    size: 34732287
+    subdir: lib/amazonka-core
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/amazonka-core
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+- completed:
+    name: amazonka-cloudformation
+    pantry-tree:
+      sha256: 25e860bcbfaba5317b0e5567aceffbb10b7314400437e0f8a999551c0fa2f216
+      size: 27257
+    sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3
+    size: 34732287
+    subdir: lib/services/amazonka-cloudformation
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/services/amazonka-cloudformation
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+- completed:
+    name: amazonka-ec2
+    pantry-tree:
+      sha256: 51aee8c10460ea60030dd9c3ae09dfdd78ae71c20e304f8824ba2275ec16a20d
+      size: 234434
+    sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3
+    size: 34732287
+    subdir: lib/services/amazonka-ec2
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/services/amazonka-ec2
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+- completed:
+    name: amazonka-lambda
+    pantry-tree:
+      sha256: e99dc2ab8f03c47702d3ba13cd416942e2143b4e494136d482749d2d47ee09ac
+      size: 21343
+    sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3
+    size: 34732287
+    subdir: lib/services/amazonka-lambda
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/services/amazonka-lambda
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+- completed:
+    name: amazonka-s3
+    pantry-tree:
+      sha256: 50bb47db3771d94ee26711bad9d91b1dc32e6466a9a580e9333af434728052b1
+      size: 38690
+    sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3
+    size: 34732287
+    subdir: lib/services/amazonka-s3
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/services/amazonka-s3
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+- completed:
+    name: amazonka-secretsmanager
+    pantry-tree:
+      sha256: e3fff44d0288efd08e15cf06fd1f2116519ea626fdddbebd07102839e18dd85f
+      size: 7039
+    sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3
+    size: 34732287
+    subdir: lib/services/amazonka-secretsmanager
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/services/amazonka-secretsmanager
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+- completed:
+    name: amazonka-sso
+    pantry-tree:
+      sha256: f8897d82072d662605f60dc3d18e921c04bbb337b5d7caaeaece36fc8aee7fb9
+      size: 1817
+    sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3
+    size: 34732287
+    subdir: lib/services/amazonka-sso
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/services/amazonka-sso
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+- completed:
+    name: amazonka-sts
+    pantry-tree:
+      sha256: b2a18c0a04c999f9f32e114ad94bf76a89e463dbb16063ebf0899ee28808f898
+      size: 2880
+    sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3
+    size: 34732287
+    subdir: lib/services/amazonka-sts
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+    version: '2.0'
+  original:
+    subdir: lib/services/amazonka-sts
+    url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz
+snapshots:
+- completed:
+    sha256: 9444fadfa30b67a93080254d53872478c087592ad64443e47c546cdcd13149ae
+    size: 678857
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/0.yaml
+  original: lts-23.0
diff --git a/xray/package.yaml b/xray/package.yaml
index 0b37a22f..2fadf705 100644
--- a/xray/package.yaml
+++ b/xray/package.yaml
@@ -19,7 +19,7 @@ dependencies:
 - mprelude
 - mio-core
 - mtl
-- network ^>= 3.1 && >= 3.1.2
+- network ^>= 3.1 && >= 3.1.2 || ^>= 3.2
 - pathtype
 - random
 - scientific
diff --git a/xray/xray.cabal b/xray/xray.cabal
index 880bbfff..f2162468 100644
--- a/xray/xray.cabal
+++ b/xray/xray.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -84,7 +84,7 @@ library
     , mio-core
     , mprelude
     , mtl
-    , network (>=3.1 && <3.2) && >=3.1.2
+    , network (>=3.1 && <3.2) && >=3.1.2 || >=3.2 && <3.3
     , pathtype
     , random
     , scientific
@@ -152,7 +152,7 @@ test-suite test
     , mio-core
     , mprelude
     , mtl
-    , network (>=3.1 && <3.2) && >=3.1.2
+    , network (>=3.1 && <3.2) && >=3.1.2 || >=3.2 && <3.3
     , pathtype
     , random
     , scientific