diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92398169bb0c4b834d234bf1cec656073e7e04b0..f3bed3538478397158663a93d3c3153b79d59959 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,34 +1,24 @@
 ---
 variables:
-# work around https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/2148
-# value should be "recursive" without workaround
-  GIT_SUBMODULE_STRATEGY: none
+  GIT_SUBMODULE_STRATEGY: recursive
+  HYPERTHREADING: "false"
+  OMP_NUM_THREADS: 1
 
 before_script:
-- echo "Running make concurrently with $(nproc) cores, where possibly"
-# make sure we can update submodules and apply the patches
-- git submodule foreach --recursive git reset --hard HEAD
-- git submodule foreach --recursive git clean -fdx
-# work around https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/2148
-- git submodule sync --recursive
-- git submodule update --init --recursive
-# end workaround
-- patches/apply_patches.sh
-# detect number of processors, but make sure never to run with -j"", as the
-# build host would likely run out of memory
-- ": ${DUNECI_PARALLEL:=$(nproc || echo 1)}"
-- export DUNECI_PARALLEL
+  - echo "Running make concurrently with ${DUNECI_PARALLEL} cores, where possibly"
+  - patches/apply_patches.sh
+  - duneci-install-module --recursive https://gitlab.dune-project.org/dominic/dune-opcounter.git
 
-git--gcc:
-  image: registry.dune-project.org/joe/dune-perftool-ci/perftool-base:git
+git-debian-10-gcc-7-14:
+  image: "registry.dune-project.org/docker/ci/dune-pdelab:git-debian-10-gcc-7-14"
   script: duneci-standard-test
   tags:
     - "cores:20"
     - "perftool"
 
-git--clang:
-  image: registry.dune-project.org/joe/dune-perftool-ci/perftool-base:git
-  script: duneci-standard-test --opts=/duneci/opts.clang
+git-debian-10-clang-6-libcpp-17:
+  image: "registry.dune-project.org/docker/ci/dune-pdelab:git-debian-10-clang-6-libcpp-17"
+  script: duneci-standard-test
   tags:
     - "cores:20"
     - "perftool"
diff --git a/test/stokes/stokes.mini b/test/stokes/stokes.mini
index b281b6bbe7755097c091007d1c9ed0b6840afad2..08461d66b76724827d040ee1e7243bf946d68256 100644
--- a/test/stokes/stokes.mini
+++ b/test/stokes/stokes.mini
@@ -13,7 +13,7 @@ reference = hagenpoiseuille_ref
 extension = vtu
 
 [formcompiler]
-compare_l2errorsquared = 1e-11
+compare_l2errorsquared = 1e-10
 
 [formcompiler.r]
 numerical_jacobian = 0, 1 | expand num