diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 12a1ec29c..609b027bf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,9 +37,11 @@ jobs:
           - '5.2.x'
     steps:
     - uses: actions/checkout@v2
-    - uses: avsm/setup-ocaml@v2
+    - uses: avsm/setup-ocaml@v3
       with:
         ocaml-compiler: ${{ matrix.ocaml_version }}
+        opam-pin: false
+        opam-local-packages:
     - run: opam repo add coq-dev https://coq.inria.fr/opam/core-dev
     - run: opam install coq-core.${{ matrix.coq_version }}
     - run: opam install coq-stdlib.${{ matrix.coq_version }}
diff --git a/coq-elpi.opam b/coq-elpi.opam
index 5d414f24a..0b03e2429 100644
--- a/coq-elpi.opam
+++ b/coq-elpi.opam
@@ -19,7 +19,7 @@ depends: [
   "ocaml" {>= "4.10.0"}
   "stdlib-shims"
   "elpi" {>= "1.18.2" & < "1.20.0~"}
-  "coq" {>= "8.20+rc1" & < "8.21"}
+  "coq" {>= "8.20+rc1" & < "8.21~"}
   "ppx_optcomp"
   "ocaml-lsp-server" {dev}
   "odoc" {with-doc}
diff --git a/dune-project b/dune-project
index 2910e9f08..44d199d72 100644
--- a/dune-project
+++ b/dune-project
@@ -32,7 +32,7 @@
   (ocaml (>= 4.10.0))
   stdlib-shims
   (elpi (and (>= 1.18.2) (< 1.20.0~)))
-  (coq (and (>= 8.20+rc1) (< 8.21)))
+  (coq (and (>= 8.20+rc1) (< 8.21~)))
   ppx_optcomp
   (ocaml-lsp-server :dev)))