diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 78613ae8..4a755a59 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,12 +13,12 @@ jobs:
       fail-fast: true
       matrix:
         os:
-          - macos-latest
           - ubuntu-latest
-          - windows-latest
+            #- macos-latest
+            #- windows-latest
         ocaml-compiler:
-          - 4.04.x
-          - 4.14.x
+          - 4.04
+          - 4.14
 
     runs-on: ${{ matrix.os }}
 
@@ -30,9 +30,12 @@ jobs:
         uses: ocaml/setup-ocaml@v2
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          opam-local-packages: |
+            ./tiny_httpd.opam
+            ./tiny_httpd_camlzip.opam
           opam-depext-flags: --with-test
 
-      - run: opam install . --deps-only --with-test
+      - run: opam install ./tiny_httpd.opam ./tiny_httpd_camlzip.opam --deps-only --with-test
 
       - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip
 
@@ -43,3 +46,4 @@ jobs:
 
       - run: opam exec -- dune build @src/runtest @examples/runtest @tests/runtest -p tiny_httpd_camlzip
         if: ${{ matrix.os == 'ubuntu-latest' }}
+
diff --git a/.github/workflows/main5.yml b/.github/workflows/main5.yml
new file mode 100644
index 00000000..c2632371
--- /dev/null
+++ b/.github/workflows/main5.yml
@@ -0,0 +1,45 @@
+name: build (ocaml 5)
+
+on:
+  pull_request:
+  push:
+  schedule:
+    # Prime the caches every Monday
+    - cron: 0 1 * * MON
+
+jobs:
+  build:
+    strategy:
+      fail-fast: true
+      matrix:
+        os:
+          - ubuntu-latest
+            #- macos-latest
+            #- windows-latest
+        ocaml-compiler:
+          - 5.0.x
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Use OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v2
+        with:
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          opam-depext-flags: --with-test
+
+      - run: opam install . --deps-only --with-test
+
+      - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip,tiny_httpd_eio
+
+      - run: opam exec -- dune build @src/runtest @examples/runtest @tests/runtest -p tiny_httpd
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+
+      - run: opam install tiny_httpd
+
+      - run: opam exec -- dune build @src/runtest @examples/runtest @tests/runtest -p tiny_httpd_camlzip
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+