diff --git a/avro.cabal b/avro.cabal
--- a/avro.cabal
+++ b/avro.cabal
@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   avro
-version:                0.6.2.0
+version:                0.6.2.1
 synopsis:               Avro serialization support for Haskell
 description:            Avro serialization and deserialization support for Haskell
 category:               Data
@@ -11,7 +11,7 @@
 maintainer:             Alexey Raga <alexey.raga@gmail.com>
 license:                BSD-3-Clause
 license-file:           LICENSE
-tested-with:            GHC == 9.2.2, GHC == 9.0.2, GHC == 8.10.7, GHC == 8.8.4, GHC == 8.6.5
+tested-with:            GHC == 9.10.1, GHC == 9.8.2, GHC == 9.6.6
 build-type:             Simple
 extra-source-files:     README.md
                         ChangeLog.md
@@ -75,7 +75,7 @@
 common scientific               { build-depends: scientific                                                         }
 common semigroups               { build-depends: semigroups                                                         }
 common tagged                   { build-depends: tagged                                                             }
-common text                     { build-depends: text                     >= 1.2.3      && < 1.3 || >= 2.0 && < 2.1 }
+common text                     { build-depends: text                     >= 1.2.3      && < 1.3 || >= 2.0 && < 2.2 }
 common time                     { build-depends: time                                                               }
 common template-haskell         { build-depends: template-haskell         >= 2.4        && < 3                      }
 common tf-random                { build-depends: tf-random                                                          }
@@ -86,7 +86,7 @@
 common vector                   { build-depends: vector                                                             }
 common zlib                     { build-depends: zlib                                                               }
 
-common gauge                    { if arch(x86_64) || arch(i386) { build-depends: gauge                            } }
+common gauge                    { build-depends: criterion                                                          }
 
 common config
   default-language:     Haskell2010
@@ -267,8 +267,7 @@
   default-language:     Haskell2010
   type:                 exitcode-stdio-1.0
   main-is:              Main.hs
-  if arch(x86_64) || arch(i386)
-    other-modules:      Bench.Deconflict
+  other-modules:        Bench.Deconflict
                         Bench.Deconflict.Reader
                         Bench.Deconflict.Writer
                         Bench.Encoding
diff --git a/bench/Bench/Deconflict.hs b/bench/Bench/Deconflict.hs
--- a/bench/Bench/Deconflict.hs
+++ b/bench/Bench/Deconflict.hs
@@ -8,7 +8,7 @@
 )
 where
 
-import Data.Avro                   (decodeContainerWithReaderSchema, decodeValue, decodeValueWithSchema, encodeContainerWithSchema, encodeValueWithSchema, nullCodec)
+import Data.Avro                   (decodeContainerWithReaderSchema, decodeValueWithSchema, encodeContainerWithSchema, encodeValueWithSchema, nullCodec)
 import Data.Avro.Schema.ReadSchema (fromSchema)
 import Data.Vector                 (Vector)
 
@@ -17,7 +17,8 @@
 import qualified Data.Vector             as Vector
 import qualified System.Random           as Random
 
-import Gauge
+-- import Gauge
+import Criterion.Main
 
 newOuter :: IO W.Outer
 newOuter = do
@@ -29,12 +30,12 @@
 many = Vector.replicateM
 
 values :: Benchmark
-values = env (many 1e5 $ encodeValueWithSchema W.schema'Outer <$> newOuter) $ \ values ->
+values = env (many 1e5 $ encodeValueWithSchema W.schema'Outer <$> newOuter) $ \ vs ->
   let
     readSchema = fromSchema W.schema'Outer
   in bgroup "Encoded: ByteString"
       [ bgroup "No Deconflict"
-          [ bench "Read via FromAvro" $ nf (fmap (decodeValueWithSchema @W.Outer readSchema)) values
+          [ bench "Read via FromAvro" $ nf (fmap (decodeValueWithSchema @W.Outer readSchema)) vs
           ]
       ]
 
diff --git a/bench/Bench/Encoding.hs b/bench/Bench/Encoding.hs
--- a/bench/Bench/Encoding.hs
+++ b/bench/Bench/Encoding.hs
@@ -16,17 +16,16 @@
 where
 
 import           Control.DeepSeq
-import           Data.Avro               (decodeContainerWithEmbeddedSchema, encodeContainer, encodeContainerWithSchema, encodeValueWithSchema, nullCodec)
+import           Data.Avro               (decodeContainerWithEmbeddedSchema, encodeValueWithSchema, nullCodec)
 import qualified Data.Avro               as Avro
 import           Data.Avro.Deriving      (deriveAvroFromByteString, r)
-import           Data.ByteString         (ByteString)
-import           Data.ByteString.Builder
 import qualified Data.ByteString.Lazy    as BL
 import           Data.List               (unfoldr)
 import qualified Data.Vector             as Vector
 import qualified System.Random           as Random
 
-import Gauge
+-- import Gauge
+import Criterion.Main
 
 deriveAvroFromByteString [r|
 {
diff --git a/bench/Main.hs b/bench/Main.hs
--- a/bench/Main.hs
+++ b/bench/Main.hs
@@ -4,15 +4,16 @@
 
 module Main where
 
-#if defined(i386_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+-- #if defined(i386_HOST_ARCH) || defined(x86_64_HOST_ARCH)
 import qualified Bench.Deconflict as Deconflict
 import qualified Bench.Encoding   as Encoding
-import Gauge
-#endif
+import Criterion.Main
+-- import Gauge
+-- #endif
 
 main :: IO ()
 main =
-#if defined(i386_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+-- #if defined(i386_HOST_ARCH) || defined(x86_64_HOST_ARCH)
   defaultMain
     [ Deconflict.values
     , Encoding.encodeToBS
@@ -20,6 +21,6 @@
     , Encoding.roundtripContainer
     , Deconflict.container
     ]
-#else
-  return ()
-#endif
+-- #else
+--   return ()
+-- #endif