diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e58ad89..4b3feab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,9 +3,16 @@ name: CI
 # Trigger the workflow on push or pull request, but only for the main branch
 on:
   pull_request:
+    branches: [master]
   push:
     branches: [master]
 
+# This ensures that previous jobs for the PR are canceled when the PR is
+# updated.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
 # Env vars for tests
 env:
   MINIO_ACCESS_KEY: minio
@@ -15,32 +22,32 @@ env:
 
 jobs:
   cabal:
-    name: ${{ matrix.os }} / ghc ${{ matrix.ghc }}
+    name: ${{ matrix.os }} / ghc-${{ matrix.ghc }} / cabal-${{ matrix.cabal }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-        cabal: ["3.2"]
+        os: [ubuntu-latest, windows-latest] # Removed macos-latest due to cert issues.
+        cabal: ["3.6"]
         ghc:
-          - "8.4.4"
-          - "8.6.5"
+          # - "9.0.1"
+          - "8.10.7"
           - "8.8.4"
-          - "8.10.2"
-        exclude:
-          - os: macOS-latest
-            ghc: 8.8.4
-          - os: macOS-latest
-            ghc: 8.6.5
-          - os: windows-latest
-            ghc: 8.10.2
-          - os: windows-latest
-            ghc: 8.6.5
+          - "8.6.5"
+        # exclude:
+        #   - os: macOS-latest
+        #     ghc: 8.8.4
+        #   - os: macOS-latest
+        #     ghc: 8.6.5
+        #   - os: windows-latest
+        #     ghc: 8.10.7
+        #   - os: windows-latest
+        #     ghc: 8.6.5
 
     steps:
     - uses: actions/checkout@v2
       if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'
 
-    - uses: actions/setup-haskell@v1.1.4
+    - uses: haskell/actions/setup@v1
       id: setup-haskell-cabal
       name: Setup Haskell
       with:
@@ -123,9 +130,10 @@ jobs:
     - uses: actions/checkout@v2
       if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'
 
-    - uses: actions/setup-haskell@v1.1.4
+    - uses: haskell/actions/setup@v1
       name: Setup Haskell Stack
       with:
+        enable-stack: true
         ghc-version: ${{ matrix.ghc }}
         stack-version: ${{ matrix.stack }}
 
diff --git a/minio-hs.cabal b/minio-hs.cabal
index 3cda739..759c676 100644
--- a/minio-hs.cabal
+++ b/minio-hs.cabal
@@ -57,7 +57,7 @@ common base-settings
                      , Network.Minio.JsonParser
   build-depends:       base >= 4.7 && < 5
                      , protolude >= 0.3 && < 0.4
-                     , aeson >= 1.2
+                     , aeson >= 1.2 && < 2
                      , base64-bytestring >= 1.0
                      , binary >= 0.8.5.0
                      , bytestring >= 0.10