diff --git a/.github/workflows/docker-action.yml b/.github/workflows/docker-action.yml
index dc2975f..aa0bee6 100644
--- a/.github/workflows/docker-action.yml
+++ b/.github/workflows/docker-action.yml
@@ -18,6 +18,9 @@ jobs:
       matrix:
         image:
           - 'mathcomp/mathcomp-dev:coq-dev'
+          - 'mathcomp/mathcomp:2.2.0-coq-8.20'
+          - 'mathcomp/mathcomp:2.2.0-coq-8.19'
+          - 'mathcomp/mathcomp:2.1.0-coq-8.18'
           - 'mathcomp/mathcomp:2.0.0-coq-8.17'
           - 'mathcomp/mathcomp:1.17.0-coq-8.17'
           - 'mathcomp/mathcomp:1.16.0-coq-8.17'
diff --git a/coq-autosubst.opam b/coq-autosubst.opam
index 5659f0c..6e3d129 100644
--- a/coq-autosubst.opam
+++ b/coq-autosubst.opam
@@ -23,7 +23,7 @@ substitutions."""
 build: [make "-j%{jobs}%"]
 install: [make "install"]
 depends: [
-  "coq" {(>= "8.14" & < "8.18~") | (= "dev")}
+  "coq" {(>= "8.14" & < "8.21~") | (= "dev")}
 ]
 
 tags: [
diff --git a/meta.yml b/meta.yml
index ad74c04..980ffb0 100644
--- a/meta.yml
+++ b/meta.yml
@@ -47,11 +47,17 @@ license:
 
 supported_coq_versions:
   text: 8.14 or later
-  opam: '{(>= "8.14" & < "8.18~") | (= "dev")}'
+  opam: '{(>= "8.14" & < "8.21~") | (= "dev")}'
 
 tested_coq_opam_versions:
 - version: 'coq-dev'
   repo: 'mathcomp/mathcomp-dev'
+- version: '2.2.0-coq-8.20'
+  repo: 'mathcomp/mathcomp'
+- version: '2.2.0-coq-8.19'
+  repo: 'mathcomp/mathcomp'
+- version: '2.1.0-coq-8.18'
+  repo: 'mathcomp/mathcomp'
 - version: '2.0.0-coq-8.17'
   repo: 'mathcomp/mathcomp'
 - version: '1.17.0-coq-8.17'