diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 514a871db1eeeb8049ae8201940a49e419addce5..06c9efd98cc4cec9082d8a845b01ab9e697e0981 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,18 +3,33 @@ image: ralfjung/opam-ci:latest
 variables:
   CPU_CORES: "9"
 
-iris_atomic-coq8.6:
+.template: &template
   tags:
   - fp-timing
   script:
   # prepare
-  - . build/opam-ci.sh coq 8.6 coq-mathcomp-ssreflect 1.6.1
+  - . build/opam-ci.sh coq "$COQ_VERSION" coq-mathcomp-ssreflect "$SSR_VERSION"
+  - env | egrep '^(CI_BUILD_REF|CI_RUNNER)' > build-env.txt
   # build
-  - 'time make -j$CPU_CORES'
+  - 'time make -k -j$CPU_CORES TIMED=y 2>&1 | tee build-log.txt'
+  - 'if fgrep Axiom build-log.txt >/dev/null; then exit 1; fi'
+  - 'cat build-log.txt | egrep "[a-zA-Z0-9_/-]+ \(user: [0-9]" | tee build-time.txt'
+  - 'if test -n "$VALIDATE" && (( RANDOM % 10 == 0 )); then make validate; fi'
   cache:
-    key: "coq8.6"
+    key: "coq$COQ_VERSION-ssr$SSR_VERSION"
     paths:
     - opamroot/
   only:
   - master
   - /^ci/
+
+iris_atomic-coq8.6.1:
+  <<: *template
+  variables:
+    COQ_VERSION: "8.6.1"
+    SSR_VERSION: "1.6.1"
+    VALIDATE: 1
+  artifacts:
+    paths:
+    - build-time.txt
+    - build-env.txt
diff --git a/README.md b/README.md
index 0e3c77d9bd49055e385ce26dd72666e65f946f00..f20f1370f18b836c7544c0573343d8156fc7747c 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Atomicity related verification based on Iris logic.
 
 This version is known to compile with:
 
- - Coq 8.6
+ - Coq 8.6.1
  - Ssreflect 1.6.1
  - A development version of [Iris](https://gitlab.mpi-sws.org/FP/iris-coq/)