diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 41b7d90d0d..3230006d87 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,12 +27,15 @@ jobs:
             ghc: '8.8.3' # fails due to segfault
           - os: windows-latest
             ghc: '8.8.2' # fails due to error with Cabal
+        include:
+          - os: windows-latest
+            ghc: '8.10.2.2' # only available for windows and choco
 
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: true
-    - uses: actions/setup-haskell@v1.1.3
+    - uses: actions/setup-haskell@v1
       with:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: '3.2'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 365705f38b..a948d6e55f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,21 +7,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.2.2', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
+        ghc: ['8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
         os: [ubuntu-latest, macOS-latest, windows-latest]
         exclude:
-          - os: ubuntu-latest
-            ghc: '8.10.2.2' # only valid for windows and chocolatey
-          - os: macOS-latest
-            ghc: '8.10.2.2' # only valid for windows and chocolatey:  
           - os: windows-latest
-            ghc: '8.10.2' # unusable due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550
+            ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550
           - os: windows-latest
             ghc: '8.8.4' # also fails due to segfault :(
           - os: windows-latest
             ghc: '8.8.3' # fails due to segfault
           - os: windows-latest
             ghc: '8.8.2' # fails due to error with Cabal
+        include:
+          - os: windows-latest
+            ghc: '8.10.2.2' # only available for windows and choco
 
     steps:
     - uses: actions/checkout@v2