diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca84385c..bf750ac5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,8 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        stack: ["2.1.3"]
-        ghc: ["8.8.3"]
+        stack: ["2.15.7"]
 
     steps:
     - name: Get the version
@@ -19,17 +18,18 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - uses: haskell/actions/setup@v2
+    - uses: haskell-actions/setup@v2
       name: Setup Haskell Stack
       with:
-        ghc-version: ${{ matrix.ghc }}
+        enable-stack: true
         stack-version: ${{ matrix.stack }}
+        stack-no-global: true
 
     - uses: actions/cache@v2
       name: Cache ~/.stack
       with:
         path: ~/.stack
-        key: "${{ runner.os }}-${{ matrix.ghc }}-v9-${{ hashFiles('stylish-haskell.cabal', 'stack.yaml', 'stack.yaml.lock') }}"
+        key: "${{ runner.os }}-v9-${{ hashFiles('stylish-haskell.cabal', 'stack.yaml', 'stack.yaml.lock') }}"
 
     - name: Add ~/.local/bin to PATH
       run: echo "$HOME/.local/bin" >> $GITHUB_PATH
diff --git a/Makefile b/Makefile
index 058f0cd2..bd77d0bf 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ COMPRESS_BIN_DEPS=$(UPX_BINARY)
 COMPRESS_BIN=upx
 endif
 
-STACK=stack --system-ghc
+STACK=stack
 
 # Default target.
 .PHONY: build