diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82b8d8868..d36fba5fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,10 +52,10 @@ opam-lint:4.07.1:
   variables:
     COMPILER: "4.07.1"
 
-opam-lint:4.09.0:
+opam-lint:4.09.1:
   extends: .opam-lint
   variables:
-    COMPILER: "4.09.0"
+    COMPILER: "4.09.1"
 
 
 opam-build:4.05.0:
@@ -65,6 +65,15 @@ opam-build:4.05.0:
   except:
     - web
 
+opam-build:4.05.0:coq-native:
+  extends: .opam-build
+  variables:
+    COMPILER: "4.05.0"
+    EXTRA_OPAM_OPTION: "coq-native"
+  except:
+    - web
+  allow_failure: true
+
 opam-build:4.07.1:
   extends: .opam-build
   variables:
@@ -72,17 +81,53 @@ opam-build:4.07.1:
   except:
     - web
 
-opam-build:4.09.0:
+opam-build:4.07.1:coq-native:
+  extends: .opam-build
+  variables:
+    COMPILER: "4.07.1"
+    EXTRA_OPAM_OPTION: "coq-native"
+  except:
+    - web
+  allow_failure: true
+
+opam-build:4.07.1+flambda:coq-native:
+  extends: .opam-build
+  variables:
+    COMPILER: "4.07.1+flambda"
+    EXTRA_OPAM_OPTION: "coq-native"
+  except:
+    - web
+  allow_failure: true
+
+opam-build:4.09.1:
+  extends: .opam-build
+  variables:
+    COMPILER: "4.09.1"
+  except:
+    - web
+
+opam-build:4.09.1:coq-native:
+  extends: .opam-build
+  variables:
+    COMPILER: "4.09.1"
+    EXTRA_OPAM_OPTION: "coq-native"
+  except:
+    - web
+  allow_failure: true
+
+opam-build:4.09.1+flambda:coq-native:
   extends: .opam-build
   variables:
-    COMPILER: "4.09.0"
+    COMPILER: "4.09.1+flambda"
+    EXTRA_OPAM_OPTION: "coq-native"
   except:
     - web
+  allow_failure: true
 
 opam-build:any:
   extends: .opam-build
   variables:
-    COMPILER: "4.09.0"
+    COMPILER: "4.09.1"
     EXTRA_OPAM_OPTION: "--unlock-base"
   except:
     - web
@@ -106,10 +151,10 @@ opam-build-no-timeout:4.07.1:
   tags:
     - no-timeout
 
-opam-build-no-timeout:4.09.0:
+opam-build-no-timeout:4.09.1:
   extends: .opam-build
   variables:
-    COMPILER: "4.09.0"
+    COMPILER: "4.09.1"
   only:
     - web
   tags:
@@ -118,7 +163,7 @@ opam-build-no-timeout:4.09.0:
 opam-build:any:
   extends: .opam-build
   variables:
-    COMPILER: "4.09.0"
+    COMPILER: "4.09.1"
     EXTRA_OPAM_OPTION: "--unlock-base"
   except:
     - web
diff --git a/extra-dev/packages/coq-fiat-parsers/coq-fiat-parsers.dev/opam b/extra-dev/packages/coq-fiat-parsers/coq-fiat-parsers.dev/opam
index 0445bd981..aa888cc22 100644
--- a/extra-dev/packages/coq-fiat-parsers/coq-fiat-parsers.dev/opam
+++ b/extra-dev/packages/coq-fiat-parsers/coq-fiat-parsers.dev/opam
@@ -14,6 +14,7 @@ depends: [
   "ocaml"
   "coq" {= "dev"}
 ]
+
 dev-repo: "git+https://github.com/mit-plv/fiat.git"
 synopsis: "Mostly automated synthesis of correct-by-construction programs."
 tags: ["logpath:Fiat"]
diff --git a/extra-dev/packages/coq-unimath/coq-unimath.dev/opam b/extra-dev/packages/coq-unimath/coq-unimath.dev/opam
index dbf1f50c5..5373f389a 100644
--- a/extra-dev/packages/coq-unimath/coq-unimath.dev/opam
+++ b/extra-dev/packages/coq-unimath/coq-unimath.dev/opam
@@ -14,6 +14,7 @@ depends: [
 ]
 synopsis: "UniMath"
 flags: light-uninstall
+
 url {
   src: "git+https://github.com/UniMath/UniMath.git#master"
 }
diff --git a/scripts/opam-coq-install-remove b/scripts/opam-coq-install-remove
index e5a78ff85..28f89633b 100755
--- a/scripts/opam-coq-install-remove
+++ b/scripts/opam-coq-install-remove
@@ -78,6 +78,8 @@ while [ ! -z "$1" ]; do
               RC=1;
               FAILURES="$FAILURES $PKG_NAME_VERSION";
             else
+              echo Installed files:
+              opam show "$PKG_NAME_VERSION" --list-files
               SUCCESSES="$SUCCESSES $PKG_NAME_VERSION";
             fi
             echo Removing $PKG_NAME