diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 65ed64684e..c39eca1aa1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -247,7 +247,7 @@ jobs:
   Build-Cabal:
     strategy:
       matrix:
-        ghc: ['9.4.8', '9.6.4']
+        ghc: ['9.4.8', '9.6.4', '9.8.1']
       fail-fast: false
     name: Build Linux (Cabal, GHC ${{ matrix.ghc }})
     runs-on: ubuntu-latest
diff --git a/cabal.project.freeze b/cabal.project.freeze
index b9a591a7c4..b141317cbf 100644
--- a/cabal.project.freeze
+++ b/cabal.project.freeze
@@ -1 +1 @@
-index-state: hackage.haskell.org 2024-01-06T00:00:00Z
+index-state: hackage.haskell.org 2024-01-22T00:00:00Z
diff --git a/cabal.project.non-nix b/cabal.project.non-nix
index e8067cb8b6..f37e81ef15 100644
--- a/cabal.project.non-nix
+++ b/cabal.project.non-nix
@@ -13,3 +13,35 @@ packages: .
 --  type: git
 --  location: https://github.com/PostgREST/hasql-pool.git
 --  tag: 4d462c4d47d762effefc7de6c85eaed55f144f1d
+
+source-repository-package
+  type: git
+  location: https://github.com/postgrest/configurator-pg.git
+  tag: e4d2dd34da2746af2fdf927d3f0a5baf9d4c5baf
+
+source-repository-package
+  type: git
+  location: https://github.com/phadej/insert-ordered-containers.git
+  tag: 61de4ad588f3d5e8935368abf87312c0d2560d55
+
+source-repository-package
+  type: git
+  location: https://github.com/well-typed/optics.git
+  tag: f82800306797f255974829e7b87380f20217dff3
+  subdir: optics-extra optics-th
+
+source-repository-package
+  type: git
+  location: https://github.com/haskellari/postgresql-libpq.git
+  tag: 05417491872ba4b74382673e834518610b993b28
+
+source-repository-package
+  type: git
+  location: https://github.com/qfpl/tasty-hedgehog.git
+  tag: 1ec8ee4c5e4e231026363673bc460eaf5c649b2d
+
+source-repository-package
+  type: git
+  location: https://github.com/wolfgangwalther/swagger2.git
+  tag: dcc6fbec4b650c779f1a2ffbdc6464b006001def
+
diff --git a/postgrest.cabal b/postgrest.cabal
index f8a0bd133a..097c79ca41 100644
--- a/postgrest.cabal
+++ b/postgrest.cabal
@@ -75,13 +75,13 @@ library
                       PostgREST.Response.Performance
                       PostgREST.Version
   other-modules:      Paths_postgrest
-  build-depends:      base                      >= 4.9 && < 4.19
+  build-depends:      base                      >= 4.9 && < 4.20
                     , HTTP                      >= 4000.3.7 && < 4000.5
                     , Ranged-sets               >= 0.3 && < 0.5
-                    , aeson                     >= 2.0.3 && < 2.2
+                    , aeson                     >= 2.0.3 && < 2.3
                     , auto-update               >= 0.1.4 && < 0.2
                     , base64-bytestring         >= 1 && < 1.3
-                    , bytestring                >= 0.10.8 && < 0.12
+                    , bytestring                >= 0.10.8 && < 0.13
                     , cache                     >= 0.1.3 && < 0.2.0
                     , case-insensitive          >= 1.2 && < 1.3
                     , cassava                   >= 0.4.5 && < 0.6
@@ -104,7 +104,7 @@ library
                     , http-types                >= 0.12.2 && < 0.13
                     , insert-ordered-containers >= 0.2.2 && < 0.3
                     , interpolatedstring-perl6  >= 1 && < 1.1
-                    , jose                      >= 0.8.5.1 && < 0.11
+                    , jose                      >= 0.8.5.1 && < 0.12
                     , lens                      >= 4.14 && < 5.3
                     , lens-aeson                >= 1.0.1 && < 1.3
                     , mtl                       >= 2.2.2 && < 2.4
@@ -118,7 +118,7 @@ library
                     , scientific                >= 0.3.4 && < 0.4
                     , streaming-commons         >= 0.1.1 && < 0.3
                     , swagger2                  >= 2.4 && < 2.9
-                    , text                      >= 1.2.2 && < 2.1
+                    , text                      >= 1.2.2 && < 2.2
                     , time                      >= 1.6 && < 1.13
                     , timeit                    >= 2.0 && < 2.1
                     , unordered-containers      >= 0.2.8 && < 0.3
@@ -159,7 +159,7 @@ executable postgrest
                       NoImplicitPrelude
   hs-source-dirs:     main
   main-is:            Main.hs
-  build-depends:      base                >= 4.9 && < 4.19
+  build-depends:      base                >= 4.9 && < 4.20
                     , containers          >= 0.5.7 && < 0.7
                     , postgrest
                     , protolude           >= 0.3.1 && < 0.4
@@ -233,19 +233,19 @@ test-suite spec
                       Feature.RollbackSpec
                       Feature.RpcPreRequestGucsSpec
                       SpecHelper
-  build-depends:      base              >= 4.9 && < 4.19
-                    , aeson             >= 2.0.3 && < 2.2
+  build-depends:      base              >= 4.9 && < 4.20
+                    , aeson             >= 2.0.3 && < 2.3
                     , aeson-qq          >= 0.8.1 && < 0.9
                     , async             >= 2.1.1 && < 2.3
                     , auto-update       >= 0.1.4 && < 0.2
                     , base64-bytestring >= 1 && < 1.3
-                    , bytestring        >= 0.10.8 && < 0.12
+                    , bytestring        >= 0.10.8 && < 0.13
                     , case-insensitive  >= 1.2 && < 1.3
                     , containers        >= 0.5.7 && < 0.7
                     , hasql-pool        >= 0.10 && < 0.11
                     , hasql-transaction >= 1.0.1 && < 1.1
                     , heredoc           >= 0.2 && < 0.3
-                    , hspec             >= 2.3 && < 2.11
+                    , hspec             >= 2.3 && < 2.12
                     , hspec-wai         >= 0.10 && < 0.12
                     , hspec-wai-json    >= 0.10 && < 0.12
                     , http-types        >= 0.12.3 && < 0.13
@@ -257,7 +257,7 @@ test-suite spec
                     , protolude         >= 0.3.1 && < 0.4
                     , regex-tdfa        >= 1.2.2 && < 1.4
                     , scientific        >= 0.3.4 && < 0.4
-                    , text              >= 1.2.2 && < 2.1
+                    , text              >= 1.2.2 && < 2.2
                     , transformers-base >= 0.4.4 && < 0.5
                     , wai               >= 3.2.1 && < 3.3
                     , wai-extra         >= 3.0.19 && < 3.2
@@ -275,7 +275,7 @@ test-suite doctests
                       NoImplicitPrelude
   hs-source-dirs:     test/doc
   main-is:            Main.hs
-  build-depends:      base              >= 4.9 && < 4.19
+  build-depends:      base              >= 4.9 && < 4.20
                     , doctest           >= 0.8
                     , postgrest
                     , pretty-simple