diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ecf9cc92c312b61eccb5e144477061bbf2fb60d9..442e32b78489589dbce84ebcf3735a104aff0cc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,21 +44,31 @@ variables:
 
 ## Build jobs
 
+# The newest version runs with timing.
 build-coq.8.18.0:
   <<: *template
   variables:
     OPAM_PINS: "coq version 8.18.0"
     DENY_WARNINGS: "1"
+    MANGLE_NAMES: "1"
+    OPAM_PKG: "1"
+    DOC_DIR: "coqdoc@center.mpi-sws.org:iris"
+    DOC_OPTS: "--external https://plv.mpi-sws.org/coqdoc/stdpp/ stdpp"
+  tags:
+  - fp-timing
+  interruptible: false
 
-build-coq.8.17.0:
+# The newest version also runs in MRs, without timing.
+build-coq.8.18.0-mr:
   <<: *template
+  <<: *only_mr
   variables:
-    OPAM_PINS: "coq version 8.17.0"
+    OPAM_PINS: "coq version 8.18.0"
     DENY_WARNINGS: "1"
+    MANGLE_NAMES: "1"
 
-build-coq.8.17.0-mr:
+build-coq.8.17.0:
   <<: *template
-  <<: *only_mr
   variables:
     OPAM_PINS: "coq version 8.17.0"
     DENY_WARNINGS: "1"
@@ -69,14 +79,8 @@ build-coq.8.16.1:
   variables:
     OPAM_PINS: "coq version 8.16.1"
     DENY_WARNINGS: "1"
-    MANGLE_NAMES: "1"
-    OPAM_PKG: "1"
-    DOC_DIR: "coqdoc@center.mpi-sws.org:iris"
-    DOC_OPTS: "--external https://plv.mpi-sws.org/coqdoc/stdpp/ stdpp"
-  tags:
-  - fp-timing
-  interruptible: false
 
+# The oldest version runs in MRs, without name mangling.
 build-coq.8.15.2:
   <<: *template
   <<: *branches_and_mr