diff --git a/cabal.project b/cabal.project
index ad4cbecd488..a1510f31740 100644
--- a/cabal.project
+++ b/cabal.project
@@ -99,15 +99,15 @@ packages:
 source-repository-package
   type: git
   location: https://github.com/biocad/servant-openapi3
-  tag: 4165b837d3a71debd1059c3735460075840000b5
-  --sha256: 1dngrr353kjhmwhn0b289jzqz5rf32llwcv79zcyq15ldpqpbib9
+  tag: 10c45b4e302567d7491cd0371317e52bf823b71c
+  --sha256: 1py1pip77q9qq5v49kpdpbp7p6yxyd0kwjn9c9bh9igp9p1d00a4
 
 -- TODO: ADP-1713
 source-repository-package
   type: git
   location: https://github.com/paolino/openapi3
-  tag: f22c31611c295637a3e72b341cd1c56d1d87b993
-  --sha256: 10l7wlaz9rcr3fysi1vwg7qqa826bb7nidkpx9jy1q7ja7ddw47i
+  tag: fab96d6d1df46418aa4658a7d6f60bf9f045b6dd
+  --sha256: 19wi7rhvb840j2ypmdfblpqk2yh11ac85x2r3y3406nml443f66k
 
 -- END OpenAPI
 --------------------------------------------------------------------------------
@@ -161,6 +161,26 @@ source-repository-package
       lib/cardano-wallet-read
 
 --------------------------------------------------------------------------------
+
+source-repository-package
+    type: git
+    location: https://github.com/jonathanknowles/fgl.git
+    tag: d55661c79ca0bb451d7dc7e8d8b99d4f80108c10
+    --sha256: 0kkw3w37bxwaam9ynmvf4z315ms99ddbmz45k2wlnpq2dp7dha50
+
+source-repository-package
+    type: git
+    location: https://github.com/jonathanknowles/wai.git
+    tag: 5ad3d1a5d472f398ded8817b0befc221a7a84cef
+    --sha256: 1nlbsqar46i9yzl8j5i8wwmya34n82b9zcnik27q3n43rxnvi1ri
+    subdir: wai-app-static
+
+source-repository-package
+    type: git
+    location: https://github.com/paolino/int-cast.git
+    tag: 0232b037552a4247b4a7ac21f816cc77cc95f7a4
+    --sha256: 1pmghd9pz35ycxp0c3f5sz4fghfi6ywjmp6wm9n45f8l5ah9vhhw
+
 -- BEGIN Constraints tweaking section
 
 allow-newer:
@@ -170,7 +190,7 @@ allow-newer:
   , ekg-wai:time
 
 constraints:
-    base >= 4.18.2.0 && < 5
+  bimap >= 0.4.0
   , openapi3 >= 3.2.0
   , persistent ^>= 2.14.6.0
 
diff --git a/flake.nix b/flake.nix
index 883375ce0c2..a68c963c2c8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -369,7 +369,7 @@
                     cardano-cli = windowsPackages.cardano-cli;
                     cardano-node = windowsPackages.cardano-node;
                     tests = lib.collect lib.isDerivation windowsPackages.tests;
-                    benchmarks = lib.collect lib.isDerivation windowsPackages.benchmarks;
+                    # benchmarks = lib.collect lib.isDerivation windowsPackages.benchmarks;
                   };
                 };
             }
diff --git a/lib/address-derivation-discovery/lib/Cardano/Wallet/Address/Discovery.hs b/lib/address-derivation-discovery/lib/Cardano/Wallet/Address/Discovery.hs
index 21a1e66a960..a48c7ba01a8 100644
--- a/lib/address-derivation-discovery/lib/Cardano/Wallet/Address/Discovery.hs
+++ b/lib/address-derivation-discovery/lib/Cardano/Wallet/Address/Discovery.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
 -- |
 -- Copyright: © 2018-2020 IOHK
 -- License: Apache-2.0
diff --git a/lib/api/src/Cardano/Wallet/Api/Client.hs b/lib/api/src/Cardano/Wallet/Api/Client.hs
index 21907fad952..24e68a9e7b4 100644
--- a/lib/api/src/Cardano/Wallet/Api/Client.hs
+++ b/lib/api/src/Cardano/Wallet/Api/Client.hs
@@ -14,6 +14,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
 
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 -- |
 -- Copyright: © 2018-2020 IOHK
 -- License: Apache-2.0
diff --git a/lib/api/src/Cardano/Wallet/Api/Http/Shelley/Server.hs b/lib/api/src/Cardano/Wallet/Api/Http/Shelley/Server.hs
index 39fc3861f0b..3431d0058a6 100644
--- a/lib/api/src/Cardano/Wallet/Api/Http/Shelley/Server.hs
+++ b/lib/api/src/Cardano/Wallet/Api/Http/Shelley/Server.hs
@@ -221,8 +221,7 @@ import Cardano.Wallet.Address.Derivation
     , stakeDerivationPath
     )
 import Cardano.Wallet.Address.Derivation.Byron
-    ( ByronKey
-    , mkByronKeyFromMasterKey
+    ( mkByronKeyFromMasterKey
     )
 import Cardano.Wallet.Address.Derivation.Icarus
     ( IcarusKey
@@ -1546,10 +1545,9 @@ mkLegacyWallet ctx wid cp meta _ pending progress = do
         W.withRootKey @s db wid mempty Prelude.id (\_ _ -> pure ())
 
 postRandomWallet
-    :: forall ctx s k n.
+    :: forall ctx s n.
         ( ctx ~ ApiLayer s
         , s ~ RndState n
-        , k ~ ByronKey
         )
     => ctx
     -> ByronWalletPostData '[12,15,18,21,24]
diff --git a/lib/application-tls/test/Cardano/Wallet/Application/TlsSpec.hs b/lib/application-tls/test/Cardano/Wallet/Application/TlsSpec.hs
index aaded0f8c43..20c5e29a612 100644
--- a/lib/application-tls/test/Cardano/Wallet/Application/TlsSpec.hs
+++ b/lib/application-tls/test/Cardano/Wallet/Application/TlsSpec.hs
@@ -2,6 +2,9 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE TemplateHaskell #-}
 
+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Cardano.Wallet.Application.TlsSpec
     ( spec
     ) where
diff --git a/lib/application/cardano-wallet-application.cabal b/lib/application/cardano-wallet-application.cabal
index 50366367155..f71cd6751ba 100644
--- a/lib/application/cardano-wallet-application.cabal
+++ b/lib/application/cardano-wallet-application.cabal
@@ -44,7 +44,6 @@ executable cardano-wallet
   import:           language, opts-exe
   main-is:          cardano-wallet.hs
   hs-source-dirs:   app/shelley
-  build-depends:    base ^>=4.18.2.0
   default-language: Haskell2010
   build-depends:
     , base
diff --git a/lib/balance-tx/lib/main/Cardano/Write/Tx.hs b/lib/balance-tx/lib/main/Cardano/Write/Tx.hs
index abd4f573036..3a77af62f63 100644
--- a/lib/balance-tx/lib/main/Cardano/Write/Tx.hs
+++ b/lib/balance-tx/lib/main/Cardano/Write/Tx.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DuplicateRecordFields #-}
 -- |
 -- Copyright: © 2023-2024 Cardano Foundation
 -- License: Apache-2.0
diff --git a/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/BalanceSpec.hs b/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/BalanceSpec.hs
index 1c2f0803222..e5451dcba6a 100644
--- a/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/BalanceSpec.hs
+++ b/lib/balance-tx/test/spec/Internal/Cardano/Write/Tx/BalanceSpec.hs
@@ -20,6 +20,8 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ViewPatterns #-}
+
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {- HLINT ignore "Use null" -}
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/lib/benchmarks/exe/db-bench.hs b/lib/benchmarks/exe/db-bench.hs
index bdde8c7c8d6..1bf9008cdd5 100644
--- a/lib/benchmarks/exe/db-bench.hs
+++ b/lib/benchmarks/exe/db-bench.hs
@@ -16,6 +16,7 @@
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
+{-# OPTIONS_GHC -Wno-x-partial #-}
 
 {-# OPTIONS_GHC -Wno-ambiguous-fields #-}
 
diff --git a/lib/delta-store/src/Test/Store.hs b/lib/delta-store/src/Test/Store.hs
index f7963cfc2bf..1bdf3893d24 100644
--- a/lib/delta-store/src/Test/Store.hs
+++ b/lib/delta-store/src/Test/Store.hs
@@ -3,6 +3,8 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 -- |
 -- Copyright: © 2023 IOHK
 -- License: Apache-2.0
diff --git a/lib/integration/framework/Test/Integration/Framework/DSL/Wallet.hs b/lib/integration/framework/Test/Integration/Framework/DSL/Wallet.hs
index 902b6571bd5..51dd9aa38e9 100644
--- a/lib/integration/framework/Test/Integration/Framework/DSL/Wallet.hs
+++ b/lib/integration/framework/Test/Integration/Framework/DSL/Wallet.hs
@@ -7,6 +7,8 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Test.Integration.Framework.DSL.Wallet
     ( createARandomWalletWithMnemonics
     , createWalletFromMnemonics
diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Byron/Migrations.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Byron/Migrations.hs
index 3a0ed5b91a0..c9e13f632a9 100644
--- a/lib/integration/scenarios/Test/Integration/Scenario/API/Byron/Migrations.hs
+++ b/lib/integration/scenarios/Test/Integration/Scenario/API/Byron/Migrations.hs
@@ -10,6 +10,8 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Test.Integration.Scenario.API.Byron.Migrations
     ( spec
     ) where
diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Shared/Transactions.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Shared/Transactions.hs
index 21682126353..44358b91e0a 100644
--- a/lib/integration/scenarios/Test/Integration/Scenario/API/Shared/Transactions.hs
+++ b/lib/integration/scenarios/Test/Integration/Scenario/API/Shared/Transactions.hs
@@ -12,6 +12,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Shared/Wallets.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Shared/Wallets.hs
index b078f5f241e..d55e8d5e3bb 100644
--- a/lib/integration/scenarios/Test/Integration/Scenario/API/Shared/Wallets.hs
+++ b/lib/integration/scenarios/Test/Integration/Scenario/API/Shared/Wallets.hs
@@ -11,6 +11,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Addresses.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Addresses.hs
index cc3c9e5f417..3fd004d6f00 100644
--- a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Addresses.hs
+++ b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Addresses.hs
@@ -1,14 +1,17 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE NumericUnderscores #-}
 {-# LANGUAGE OverloadedLabels #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
+{-# OPTIONS_GHC -Wno-x-partial #-}
 
 module Test.Integration.Scenario.API.Shelley.Addresses
     ( spec
diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Migrations.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Migrations.hs
index 8beb8d09cc9..e1161df98e9 100644
--- a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Migrations.hs
+++ b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Migrations.hs
@@ -10,6 +10,8 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Test.Integration.Scenario.API.Shelley.Migrations
     ( spec
     ) where
diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/StakePools.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/StakePools.hs
index c953ab8b0ce..0fb5c11cc4e 100644
--- a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/StakePools.hs
+++ b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/StakePools.hs
@@ -9,6 +9,8 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
+
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
 module Test.Integration.Scenario.API.Shelley.StakePools (spec) where
diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Transactions.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Transactions.hs
index 23be10e74ac..3be545920a4 100644
--- a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Transactions.hs
+++ b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Transactions.hs
@@ -12,6 +12,8 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
+
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
 {- HLINT ignore "Use head" -}
diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/TransactionsNew.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/TransactionsNew.hs
index 18f10dad8be..6c4e0106460 100644
--- a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/TransactionsNew.hs
+++ b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/TransactionsNew.hs
@@ -12,6 +12,7 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -Wno-unused-imports #-} -- temportary, until addRequiredSigners is fixed
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Wallets.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Wallets.hs
index 8725b9ca326..7a55b8eb333 100644
--- a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Wallets.hs
+++ b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/Wallets.hs
@@ -10,6 +10,8 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Test.Integration.Scenario.API.Shelley.Wallets
     ( spec
     ) where
diff --git a/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/CommandLine.hs b/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/CommandLine.hs
index 3bd12eb35f3..07df40c1374 100644
--- a/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/CommandLine.hs
+++ b/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/CommandLine.hs
@@ -3,6 +3,8 @@
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Cardano.Wallet.Launch.Cluster.CommandLine
     ( CommandLineOptions (..)
     , WalletPresence (..)
diff --git a/lib/network-layer/src/Cardano/Wallet/Network/Light.hs b/lib/network-layer/src/Cardano/Wallet/Network/Light.hs
index 1a59dfae00b..c430eb02625 100644
--- a/lib/network-layer/src/Cardano/Wallet/Network/Light.hs
+++ b/lib/network-layer/src/Cardano/Wallet/Network/Light.hs
@@ -7,6 +7,8 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Cardano.Wallet.Network.Light
     ( -- * Interface
       LightSyncSource (..)
diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Address/Gen.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Address/Gen.hs
index aa53600021d..b29b3566833 100644
--- a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Address/Gen.hs
+++ b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Address/Gen.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Cardano.Wallet.Primitive.Types.Address.Gen
     (
       -- * Generators and shrinkers
diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/AssetName/Gen.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/AssetName/Gen.hs
index 124bbbfcacb..c2836917979 100644
--- a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/AssetName/Gen.hs
+++ b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/AssetName/Gen.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Cardano.Wallet.Primitive.Types.AssetName.Gen
     (
     -- * Generators and shrinkers
diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/RewardAccount/Gen.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/RewardAccount/Gen.hs
index 6900271b395..2aa040b09d8 100644
--- a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/RewardAccount/Gen.hs
+++ b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/RewardAccount/Gen.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Cardano.Wallet.Primitive.Types.RewardAccount.Gen
     ( genRewardAccount
     , shrinkRewardAccount
diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/TokenPolicyId/Gen.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/TokenPolicyId/Gen.hs
index 89e06830222..746ababd659 100644
--- a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/TokenPolicyId/Gen.hs
+++ b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/TokenPolicyId/Gen.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Cardano.Wallet.Primitive.Types.TokenPolicyId.Gen
     (
     -- * Generators and shrinkers
diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx.hs
index 2c03f0d5f4a..191ab66715e 100644
--- a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx.hs
+++ b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx.hs
@@ -185,7 +185,7 @@ data TxChange derivationPath = TxChange
     , amount :: Coin
     , assets :: TokenMap
     , derivationPath :: derivationPath
-    } deriving (Show, Generic, Eq, Ord)
+    } deriving (Show, Generic, Eq)
 
 {-------------------------------------------------------------------------------
                           Conversions (Unsafe)
diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx/TxIn/Gen.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx/TxIn/Gen.hs
index a473c6f2219..56ecd97e239 100644
--- a/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx/TxIn/Gen.hs
+++ b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Tx/TxIn/Gen.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE PartialTypeSignatures #-}
 {-# OPTIONS_GHC -fno-warn-partial-type-signatures #-}
+{-# OPTIONS_GHC -Wno-x-partial #-}
 
 module Cardano.Wallet.Primitive.Types.Tx.TxIn.Gen
     ( genTxHash
diff --git a/lib/primitive/test/spec/Cardano/Wallet/Primitive/SlottingSpec.hs b/lib/primitive/test/spec/Cardano/Wallet/Primitive/SlottingSpec.hs
index f4595aa3fc4..a8ac2ec2f5e 100644
--- a/lib/primitive/test/spec/Cardano/Wallet/Primitive/SlottingSpec.hs
+++ b/lib/primitive/test/spec/Cardano/Wallet/Primitive/SlottingSpec.hs
@@ -4,6 +4,7 @@
 {-# LANGUAGE OverloadedLabels #-}
 {-# LANGUAGE TypeApplications #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-x-partial #-}
 
 module Cardano.Wallet.Primitive.SlottingSpec
     ( spec
diff --git a/lib/primitive/test/spec/Cardano/Wallet/Primitive/Types/RangeSpec.hs b/lib/primitive/test/spec/Cardano/Wallet/Primitive/Types/RangeSpec.hs
index 1441c22997e..df3157a4f6e 100644
--- a/lib/primitive/test/spec/Cardano/Wallet/Primitive/Types/RangeSpec.hs
+++ b/lib/primitive/test/spec/Cardano/Wallet/Primitive/Types/RangeSpec.hs
@@ -6,6 +6,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-x-partial #-}
 
 module Cardano.Wallet.Primitive.Types.RangeSpec
     ( spec
diff --git a/lib/test-utils/test/Test/Hspec/ExtraSpec.hs b/lib/test-utils/test/Test/Hspec/ExtraSpec.hs
index 824841c99b1..162ea081a87 100644
--- a/lib/test-utils/test/Test/Hspec/ExtraSpec.hs
+++ b/lib/test-utils/test/Test/Hspec/ExtraSpec.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Test.Hspec.ExtraSpec (spec) where
 
 import Prelude
diff --git a/lib/unit/cardano-wallet-unit.cabal b/lib/unit/cardano-wallet-unit.cabal
index c7f9b6d45a2..9f597b8d856 100644
--- a/lib/unit/cardano-wallet-unit.cabal
+++ b/lib/unit/cardano-wallet-unit.cabal
@@ -110,7 +110,7 @@ test-suite unit
     , delta-types
     , directory
     , either
-    , extra                               >=1.6.17
+    , extra
     , file-embed
     , filepath
     , fmt
@@ -119,8 +119,8 @@ test-suite unit
     , generic-lens
     , generics-sop
     , hedgehog-corpus
-    , hspec                               >=2.8.2
-    , hspec-core                          >=2.8.2
+    , hspec
+    , hspec-core
     , http-api-data
     , http-client
     , http-client-tls
@@ -155,7 +155,7 @@ test-suite unit
     , QuickCheck
     , quickcheck-classes
     , quickcheck-instances
-    , quickcheck-state-machine            >=0.6.0
+    , quickcheck-state-machine
     , random
     , regex-pcre-builtin
     , resourcet
diff --git a/lib/unit/test/unit/Cardano/Pool/DB/Properties.hs b/lib/unit/test/unit/Cardano/Pool/DB/Properties.hs
index ce2a95673e8..805dd232a8a 100644
--- a/lib/unit/test/unit/Cardano/Pool/DB/Properties.hs
+++ b/lib/unit/test/unit/Cardano/Pool/DB/Properties.hs
@@ -10,6 +10,8 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE TypeSynonymInstances #-}
+
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
diff --git a/lib/unit/test/unit/Cardano/Wallet/Address/Discovery/SequentialSpec.hs b/lib/unit/test/unit/Cardano/Wallet/Address/Discovery/SequentialSpec.hs
index b769f874b33..693d6cadb50 100644
--- a/lib/unit/test/unit/Cardano/Wallet/Address/Discovery/SequentialSpec.hs
+++ b/lib/unit/test/unit/Cardano/Wallet/Address/Discovery/SequentialSpec.hs
@@ -14,6 +14,7 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
diff --git a/lib/unit/test/unit/Cardano/Wallet/Address/Discovery/SharedSpec.hs b/lib/unit/test/unit/Cardano/Wallet/Address/Discovery/SharedSpec.hs
index 0118746e6bf..4849ed52fc1 100644
--- a/lib/unit/test/unit/Cardano/Wallet/Address/Discovery/SharedSpec.hs
+++ b/lib/unit/test/unit/Cardano/Wallet/Address/Discovery/SharedSpec.hs
@@ -8,6 +8,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
diff --git a/lib/unit/test/unit/Cardano/Wallet/CheckpointsSpec.hs b/lib/unit/test/unit/Cardano/Wallet/CheckpointsSpec.hs
index ec0c79c5d41..63a1c514d7b 100644
--- a/lib/unit/test/unit/Cardano/Wallet/CheckpointsSpec.hs
+++ b/lib/unit/test/unit/Cardano/Wallet/CheckpointsSpec.hs
@@ -1,4 +1,7 @@
 {-# LANGUAGE DataKinds #-}
+
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 module Cardano.Wallet.CheckpointsSpec
     ( spec
     ) where
diff --git a/lib/unit/test/unit/Cardano/Wallet/DB/LayerSpec.hs b/lib/unit/test/unit/Cardano/Wallet/DB/LayerSpec.hs
index 59f10b19bb0..cfd5b340438 100644
--- a/lib/unit/test/unit/Cardano/Wallet/DB/LayerSpec.hs
+++ b/lib/unit/test/unit/Cardano/Wallet/DB/LayerSpec.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
@@ -14,14 +15,14 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE StandaloneDeriving #-}
 
 -- |
 -- Copyright: © 2018-2020 IOHK
diff --git a/lib/unit/test/unit/Cardano/Wallet/DB/StateMachine.hs b/lib/unit/test/unit/Cardano/Wallet/DB/StateMachine.hs
index 75925b1e98f..af75e7f36f1 100644
--- a/lib/unit/test/unit/Cardano/Wallet/DB/StateMachine.hs
+++ b/lib/unit/test/unit/Cardano/Wallet/DB/StateMachine.hs
@@ -20,6 +20,7 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -Wno-unused-foralls #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
diff --git a/lib/unit/test/unit/Cardano/Wallet/DB/Store/Delegations/Migrations/V5Spec.hs b/lib/unit/test/unit/Cardano/Wallet/DB/Store/Delegations/Migrations/V5Spec.hs
index 3edf51411cb..1287754293a 100644
--- a/lib/unit/test/unit/Cardano/Wallet/DB/Store/Delegations/Migrations/V5Spec.hs
+++ b/lib/unit/test/unit/Cardano/Wallet/DB/Store/Delegations/Migrations/V5Spec.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+
 {-# OPTIONS_GHC -Wno-orphans #-}
+{-# OPTIONS_GHC -Wno-x-partial #-}
 
 module Cardano.Wallet.DB.Store.Delegations.Migrations.V5Spec where
 
diff --git a/lib/unit/test/unit/Cardano/Wallet/Primitive/ModelSpec.hs b/lib/unit/test/unit/Cardano/Wallet/Primitive/ModelSpec.hs
index 28481879ea8..d8fed2093ca 100644
--- a/lib/unit/test/unit/Cardano/Wallet/Primitive/ModelSpec.hs
+++ b/lib/unit/test/unit/Cardano/Wallet/Primitive/ModelSpec.hs
@@ -14,6 +14,8 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE UndecidableInstances #-}
+
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {- HLINT ignore "Move brackets to avoid $" -}
 
diff --git a/lib/unit/test/unit/Cardano/Wallet/Shelley/TransactionSpec.hs b/lib/unit/test/unit/Cardano/Wallet/Shelley/TransactionSpec.hs
index eea920322e1..efb67360c53 100644
--- a/lib/unit/test/unit/Cardano/Wallet/Shelley/TransactionSpec.hs
+++ b/lib/unit/test/unit/Cardano/Wallet/Shelley/TransactionSpec.hs
@@ -19,6 +19,7 @@
 {- HLINT ignore "Use camelCase" -}
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -Wno-x-partial #-}
 
 -- TODO: https://cardanofoundation.atlassian.net/browse/ADP-2841
 {-# LANGUAGE CPP #-}
diff --git a/lib/unit/test/unit/Cardano/WalletSpec.hs b/lib/unit/test/unit/Cardano/WalletSpec.hs
index ac0901073c0..04163d68cdc 100644
--- a/lib/unit/test/unit/Cardano/WalletSpec.hs
+++ b/lib/unit/test/unit/Cardano/WalletSpec.hs
@@ -17,6 +17,7 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Cardano.WalletSpec
diff --git a/lib/wallet/src/Cardano/Wallet/DB/Pure/Implementation.hs b/lib/wallet/src/Cardano/Wallet/DB/Pure/Implementation.hs
index 69e89608e0a..6f1d2fcc194 100644
--- a/lib/wallet/src/Cardano/Wallet/DB/Pure/Implementation.hs
+++ b/lib/wallet/src/Cardano/Wallet/DB/Pure/Implementation.hs
@@ -16,6 +16,8 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE UndecidableInstances #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
+
 -- TODO: https://cardanofoundation.atlassian.net/browse/ADP-2841
 {-# LANGUAGE CPP #-}
 #if __GLASGOW_HASKELL__ >= 902
diff --git a/lib/wallet/src/Cardano/Wallet/Primitive/Types/Tx/TxSeq.hs b/lib/wallet/src/Cardano/Wallet/Primitive/Types/Tx/TxSeq.hs
index 4cf8599f465..d0c45156848 100644
--- a/lib/wallet/src/Cardano/Wallet/Primitive/Types/Tx/TxSeq.hs
+++ b/lib/wallet/src/Cardano/Wallet/Primitive/Types/Tx/TxSeq.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
+{-# OPTIONS_GHC -Wno-x-partial #-}
 -- |
 -- Copyright: © 2022 IOHK
 -- License: Apache-2.0
diff --git a/nix/haskell.nix b/nix/haskell.nix
index 638237e60db..c41f8be9234 100644
--- a/nix/haskell.nix
+++ b/nix/haskell.nix
@@ -98,7 +98,7 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: mithrilPkgs: set-git-rev: haskell-n
 
     in {
       name = "cardano-wallet";
-      compiler-nix-name = "ghc966";
+      compiler-nix-name = "ghc982";
 
       src = haskellLib.cleanSourceWith {
         name = "cardano-wallet-src";