diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 085bbaf..3841aca 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,7 +6,6 @@ on:
 
 jobs:
   call-workflow:
-    uses: byteverse/.github/.github/workflows/build.yaml@main
-    secrets: inherit
+    uses: byteverse/.github/.github/workflows/build-matrix.yaml@main
     with:
-      release: false
+      cabal-file: json-query.cabal
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index bd0bbd5..9411962 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,7 +6,5 @@ on:
 
 jobs:
   call-workflow:
-    uses: byteverse/.github/.github/workflows/build.yaml@main
+    uses: byteverse/.github/.github/workflows/release.yaml@main
     secrets: inherit
-    with:
-      release: true
diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
index 9a994af..0000000
--- a/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/json-query.cabal b/json-query.cabal
index d5cb8a5..da22dab 100644
--- a/json-query.cabal
+++ b/json-query.cabal
@@ -8,7 +8,7 @@ description:
   only query JSON. They do not update it.
 
 homepage:        https://github.com/byteverse/json-query
-bug-reports:     https://github.com/byteverse/json-query
+bug-reports:     https://github.com/byteverse/json-query/issues
 license:         BSD-3-Clause
 license-file:    LICENSE
 author:          Andrew Martin
@@ -17,8 +17,14 @@ copyright:       2020 Andrew Martin
 category:        Data
 build-type:      Simple
 extra-doc-files: CHANGELOG.md
+tested-with:     GHC ==9.4.8 || ==9.6.3 || ==9.8.1
+
+common build-settings
+  default-language: Haskell2010
+  ghc-options:      -Wall -Wunused-packages
 
 library
+  import:          build-settings
   exposed-modules:
     Json.Arrow
     Json.Context
@@ -28,7 +34,6 @@ library
     Json.Path
 
   build-depends:
-    , array-chunks         >=0.1.2 && <0.2
     , base                 >=4.12  && <5
     , bytebuild            >=0.3.5 && <0.4
     , bytestring           >=0.10  && <0.12
@@ -41,25 +46,21 @@ library
     , text-short           >=0.1.3 && <0.2
     , transformers         >=0.5.6 && <0.7
 
-  hs-source-dirs:   src
-  default-language: Haskell2010
-  ghc-options:      -Wall -O2
+  hs-source-dirs:  src
+  ghc-options:     -O2
 
 test-suite test
-  default-language: Haskell2010
-  type:             exitcode-stdio-1.0
-  hs-source-dirs:   test
-  main-is:          Main.hs
+  import:         build-settings
+  type:           exitcode-stdio-1.0
+  hs-source-dirs: test
+  main-is:        Main.hs
   other-modules:
     Arrowy
     DogHouse
     Monadic
 
-  ghc-options:      -Wall -O2
   build-depends:
-    , array-chunks
     , base                 >=4.12.0.0 && <5
-    , bytebuild
     , byteslice            >=0.1.3
     , bytestring
     , hspec                >=2.11.7