diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index d6d8e2280..92f76366c 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -18,18 +18,13 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
+          - macos-latest
+          - windows-latest
         ocaml-compiler:
           - "4.14"
-          # - "5.0"
-          - "5.1"
         include:
-          - os: macos-latest
-            ocaml-compiler: "4.14"
-          - os: windows-latest
-            ocaml-compiler: "4.14"
-            opam-repositories: |
-              opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
-              default: https://github.com/ocaml/opam-repository.git
+          - os: ubuntu-latest
+            ocaml-compiler: 5.1.x
 
     runs-on: ${{ matrix.os }}
 
@@ -54,11 +49,9 @@ jobs:
         working-directory: ocaml-lsp-server/test/e2e
 
       - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          allow-prerelease-opam: true
-          opam-repositories: ${{ matrix.opam-repositories }}
 
       - name: Build and install dependencies
         run: opam install .