diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ab0237c82b3392cee3d4574066d1172b88b5c3d..538e03f3e10466ab0de254e671c98f66c06bfed9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,7 @@
 ---
 variables:
-  DUNE_CMAKE_FLAGS:   "-DDUNE_ENABLE_PYTHONBINDINGS=ON -DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE"
+  DUNE_CMAKE_FLAGS:   "-DDUNE_ENABLE_PYTHONBINDINGS=ON -DDUNE_GRID_GRIDTYPE_SELECTOR=ON -DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE"
   DUNECI_CMAKE_FLAGS: $DUNE_CMAKE_FLAGS
-  DUNE_CONTROL_PATH:  /duneci/modules:$CI_PROJECT_DIR
   DUNE_PY_DIR:        /duneci/modules/dune-py
   # adding this actually leads to the test failure seen in the core modules
   # don't know why this is required here but not for core modules - magic?
@@ -32,7 +31,9 @@ debian-11-gcc-9-17:
     - duneci-standard-test
   variables:
     DUNECI_TOOLCHAIN:  gcc-9-17
+    DUNE_CONTROL_PATH:  /duneci/modules:$CI_PROJECT_DIR
     #DUNE_CMAKE_FLAGS:   "-DDUNE_ENABLE_PYTHONBINDINGS=OFF -DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE"
+  tags: [stuttgart2]
 
 ubuntu-20.04-clang-10-17:
   image: registry.dune-project.org/docker/ci/ubuntu:20.04
@@ -40,7 +41,9 @@ ubuntu-20.04-clang-10-17:
     - duneci-standard-test
   variables:
     DUNECI_TOOLCHAIN:  clang-10-17
+    DUNE_CONTROL_PATH:  /duneci/modules:$CI_PROJECT_DIR
     #DUNE_CMAKE_FLAGS:   "-DDUNE_ENABLE_PYTHONBINDINGS=OFF -DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE"
+  tags: [stuttgart1]
 
 ubuntu-20.04-gcc-9-17:
   image: registry.dune-project.org/docker/ci/ubuntu:20.04
@@ -48,3 +51,5 @@ ubuntu-20.04-gcc-9-17:
     - duneci-standard-test
   variables:
     DUNECI_TOOLCHAIN:  gcc-9-17
+    DUNE_CONTROL_PATH:  /duneci/modules:$CI_PROJECT_DIR
+  tags: [stuttgart1]