diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d8b8bf..2a53dfb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,31 +17,29 @@ on:
 
 jobs:
   build:
+    runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
       matrix:
-        branch: [version-1-6, version-2-0, devel]
-        target: [linux, macos, windows]
-        include:
-          - target: linux
-            builder: ubuntu-latest
-          - target: macos
-            builder: macos-latest
-          - target: windows
-            builder: windows-latest
-    name: '${{ matrix.target }} (${{ matrix.branch }})'
-    runs-on: ${{ matrix.builder }}
+        nim:
+          - '1.6.x'
+          - '2.0.x'
+          - 'stable'
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macOS-latest
+    name: '${{ matrix.nim }} (${{ matrix.os }})'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: datamancer
 
-      - name: Setup Nim
-        uses: alaviss/setup-nim@0.1.1
+      - name: Setup nim
+        uses: jiro4989/setup-nim-action@v1
         with:
-          path: nim
-          version: ${{ matrix.branch }}
+          nim-version: ${{ matrix.nim }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies (Ubuntu)
         if: ${{matrix.target == 'linux'}}