diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 24de651..6eb62de 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -11,10 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - ubuntu-latest
-          # - macos-latest
-          # - windows-latest
+        os: [ubuntu-latest]
         ocaml-compiler:
           - 4.14.x
           - 5.0.x
@@ -22,6 +19,15 @@ jobs:
           - 5.2.x
           - 5.3.x
           - 5.4.x
+        include:
+          - os: macos-latest
+            ocaml-compiler: 4.14.x
+          - os: macos-latest
+            ocaml-compiler: 5.4.x
+          - os: windows-latest
+            ocaml-compiler: 4.14.x
+          - os: windows-latest
+            ocaml-compiler: 5.4.x
 
     runs-on: ${{ matrix.os }}
 
@@ -33,10 +39,6 @@ jobs:
         uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: ${{ matrix.os != 'macos-latest' }}
-          opam-repositories: |
-            default: https://github.com/ocaml/opam-repository.git
-            beta: https://github.com/ocaml/ocaml-beta-repository.git
 
       - name: Install opam packages
         run: opam install . --deps-only --yes --with-test