diff --git a/.github/workflows/matrix.yaml b/.github/workflows/matrix.yaml
index 6ca975e..38ad2ec 100644
--- a/.github/workflows/matrix.yaml
+++ b/.github/workflows/matrix.yaml
@@ -10,15 +10,13 @@ jobs:
       matrix:
         versions:
           # MSHV: three major versions
-          - ghc: '8.6'
+          - ghc: '8.10.7'
             cabal: '3.4'
-          - ghc: '8.8'
-            cabal: '3.4'
-          - ghc: '8.10'
+          - ghc: '9.0.2'
             cabal: '3.4'
           # Latest
-          - ghc: '9.0'
-            cabal: '3.4'
+          - ghc: '9.2.2'
+            cabal: '3.6'
     steps:
     - uses: actions/checkout@v2
 
diff --git a/opentracing-http-client/opentracing-http-client.cabal b/opentracing-http-client/opentracing-http-client.cabal
index d8760d2..6a074d3 100644
--- a/opentracing-http-client/opentracing-http-client.cabal
+++ b/opentracing-http-client/opentracing-http-client.cabal
@@ -34,7 +34,7 @@ library
     -Wcompat
     -Wnoncanonical-monad-instances
   build-depends:
-      base >= 4.9 && < 4.16
+      base >= 4.9 && < 4.17
     , http-client >= 0.5
     , lens >= 4.19
     , mtl >= 2.2
diff --git a/opentracing-jaeger/opentracing-jaeger.cabal b/opentracing-jaeger/opentracing-jaeger.cabal
index 462d7ae..385324f 100644
--- a/opentracing-jaeger/opentracing-jaeger.cabal
+++ b/opentracing-jaeger/opentracing-jaeger.cabal
@@ -47,7 +47,7 @@ library
     -Wnoncanonical-monad-instances
   build-depends:
       QuickCheck
-    , base >= 4.9 && < 4.16
+    , base >= 4.9 && < 4.17
     , bytestring >= 0.10
     , exceptions >= 0.8
     , hashable >= 1.2
diff --git a/opentracing-wai/opentracing-wai.cabal b/opentracing-wai/opentracing-wai.cabal
index 9177326..0f52765 100644
--- a/opentracing-wai/opentracing-wai.cabal
+++ b/opentracing-wai/opentracing-wai.cabal
@@ -34,7 +34,7 @@ library
     -Wcompat
     -Wnoncanonical-monad-instances
   build-depends:
-      base >= 4.9 && < 4.16
+      base >= 4.9 && < 4.17
     , lens >= 4.19
     , opentracing >= 0.1
     , text >= 1.2
diff --git a/opentracing-zipkin-common/opentracing-zipkin-common.cabal b/opentracing-zipkin-common/opentracing-zipkin-common.cabal
index 7049d1c..8f05568 100644
--- a/opentracing-zipkin-common/opentracing-zipkin-common.cabal
+++ b/opentracing-zipkin-common/opentracing-zipkin-common.cabal
@@ -36,7 +36,7 @@ library
     -Wnoncanonical-monad-instances
   build-depends:
       aeson >= 1.1
-    , base >= 4.9 && < 4.16
+    , base >= 4.9 && < 4.17
     , opentracing >= 0.1
     , text >= 1.2
   default-language: Haskell2010
diff --git a/opentracing-zipkin-v1/opentracing-zipkin-v1.cabal b/opentracing-zipkin-v1/opentracing-zipkin-v1.cabal
index 79cc70c..76238eb 100644
--- a/opentracing-zipkin-v1/opentracing-zipkin-v1.cabal
+++ b/opentracing-zipkin-v1/opentracing-zipkin-v1.cabal
@@ -40,7 +40,7 @@ library
     -Wnoncanonical-monad-instances
   build-depends:
       QuickCheck >= 2.14
-    , base >= 4.9 && < 4.16
+    , base >= 4.9 && < 4.17
     , bytestring >= 0.10
     , exceptions >= 0.8
     , hashable >= 1.2
diff --git a/opentracing-zipkin-v2/opentracing-zipkin-v2.cabal b/opentracing-zipkin-v2/opentracing-zipkin-v2.cabal
index 1f30075..d87bef0 100644
--- a/opentracing-zipkin-v2/opentracing-zipkin-v2.cabal
+++ b/opentracing-zipkin-v2/opentracing-zipkin-v2.cabal
@@ -36,7 +36,7 @@ library
     -Wnoncanonical-monad-instances
   build-depends:
       aeson >= 1.1
-    , base >= 4.9 && < 4.16
+    , base >= 4.9 && < 4.17
     , base64-bytestring >= 1.0
     , bytestring >= 0.10
     , exceptions >= 0.8
diff --git a/opentracing/opentracing.cabal b/opentracing/opentracing.cabal
index bac6d40..ddc1053 100644
--- a/opentracing/opentracing.cabal
+++ b/opentracing/opentracing.cabal
@@ -49,7 +49,7 @@ library
   build-depends:
       aeson >= 1.1
     , async >= 2.1
-    , base  >= 4.9 && < 4.16
+    , base  >= 4.9 && < 4.17
     , base64-bytestring >= 1.0
     , bytestring >= 0.10
     , case-insensitive >= 1.2