diff --git a/.github/workflows/haskell.yml b/.github/workflows/ci.yml
similarity index 68%
rename from .github/workflows/haskell.yml
rename to .github/workflows/ci.yml
index 5b8d43a..3a833a9 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/ci.yml
@@ -1,41 +1,45 @@
 name: Haskell CI
 
-on: [pull_request]
+on:
+  pull_request:
+    branches:
+      - "**"
+  push:
+    branches:
+      - "main"
 
 jobs:
   build:
     name: ghc ${{ matrix.ghc }}
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.3", "8.10.1"]
-        cabal: ["latest"]
+        ghc: ["8.2", "8.4", "8.6", "8.8", "8.10", "9.0", "9.2", "9.4", "9.6", "9.8", "9.10"]
 
     steps:
     - uses: actions/checkout@v2
-      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
+      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'
 
-    - uses: actions/setup-haskell@v1.1.2
+    - uses: haskell-actions/setup@v2
       name: Setup Haskell
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
 
-    - uses: actions/cache@v1
+    - uses: actions/cache@v2
       name: Cache ~/.cabal/packages
       with:
         path: ~/.cabal/packages
         key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-packages
-    - uses: actions/cache@v1
+    - uses: actions/cache@v2
       name: Cache ~/.cabal/store
       with:
         path: ~/.cabal/store
         key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-store
-    - uses: actions/cache@v1
+    - uses: actions/cache@v2
       name: Cache dist-newstyle
       with:
         path: dist-newstyle
-        key: ${{ runner.os }}-${{ matrix.ghc }}-fused-effects-random-dist
+        key: ${{ runner.os }}-${{ matrix.ghc }}-repo-dist
 
     - name: Install dependencies
       run: |
@@ -46,7 +50,7 @@ jobs:
     - name: Build & test
       run: |
         cabal v2-build   --project-file=cabal.project.ci
-        # cabal v2-run     --project-file=cabal.project.ci test
+#        cabal v2-run     --project-file=cabal.project.ci fresnel:test
         cabal v2-haddock --project-file=cabal.project.ci
         cabal v2-sdist   --project-file=cabal.project.ci
         cabal check