diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6561c37475310756ab3277c973f729cde7801742..d91ef097d5713229c8e6da0d2184d91f80d06c0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,14 @@
 ---
 # Install external dependencies
 before_script:
-  - pushd /duneci/modules
-  - git clone https://gitlab.dune-project.org/pdelab/dune-typetree.git
-  - dunecontrol --opts=/duneci/opts.gcc --only=dune-typetree all
-  - git clone https://gitlab.dune-project.org/staging/dune-functions.git
-  - dunecontrol --opts=/duneci/opts.gcc --only=dune-functions all
-  - git clone https://git.imp.fu-berlin.de/agnumpde/dune-fufem.git
-  - dunecontrol --opts=/duneci/opts.gcc --only=dune-fufem all
-  - git clone https://git.imp.fu-berlin.de/agnumpde/dune-solvers.git
-  - dunecontrol --opts=/duneci/opts.gcc --only=dune-solvers all
-  - popd
+  - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-matrix-vector.git
+  - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-fufem.git
+  - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-solvers.git
 
 dune:git--clang:
   image: duneci/dune:git
-  script:
-  - dunecontrol --opts=/duneci/opts.clang --current all
-  - dunecontrol --current make build_tests
-  - dunecontrol --current make test
+  script: duneci-standard-test --opts=/duneci/opts.clang
 
 dune:git--gcc:
   image: duneci/dune:git
-  script:
-  - dunecontrol --opts=/duneci/opts.gcc --current all
-  - dunecontrol --current make build_tests
-  - dunecontrol --current make test
+  script: duneci-standard-test