diff --git a/.ci/system_tests.sh b/.ci/system_tests.sh
index 5c23485b0e19153fdf199d353135cd54db8a6533..467d4f98251fb29b46e39168cb34a3aa68568483 100644
--- a/.ci/system_tests.sh
+++ b/.ci/system_tests.sh
@@ -18,14 +18,14 @@ g++ --version
 gcc --version
 cmake --version
 
-if test "x$DUNE_OPTS_FILE" != "x"; then
-  CMAKE_FLAGS="$(. $DUNE_OPTS_FILE; eval echo \$CMAKE_FLAGS)"
+if test "x$DUNE_OPTIONS_FILE" != "x"; then
+  CMAKE_FLAGS="$(. $DUNE_OPTIONS_FILE; eval echo \$CMAKE_FLAGS)"
 fi
 
 mkdir dune-copasi/test/build-cmake && cd dune-copasi/test/build-cmake
 
-echo "cmake $CMAKE_FALGS --build .."
-eval cmake $CMAKE_FALGS --build ..
+echo "cmake $CMAKE_FLAGS .."
+eval cmake $CMAKE_FLAGS ..
 
 cmake --target build_system_tests
 ctest -j4 -L "DUNE_SYSTEMTEST" --output-on-failure
diff --git a/.ci/unit_tests.sh b/.ci/unit_tests.sh
index 54872e6e32802f86a7f780609d5aaa8a1cce2870..1e170bdf084a5595b033886df6bd3efa5cfc3d3a 100644
--- a/.ci/unit_tests.sh
+++ b/.ci/unit_tests.sh
@@ -18,14 +18,14 @@ g++ --version
 gcc --version
 cmake --version
 
-if test "x$DUNE_OPTS_FILE" != "x"; then
-  CMAKE_FLAGS="$(. $DUNE_OPTS_FILE; eval echo \$CMAKE_FLAGS)"
+if test "x$DUNE_OPTIONS_FILE" != "x"; then
+  CMAKE_FLAGS="$(. $DUNE_OPTIONS_FILE; eval echo \$CMAKE_FLAGS)"
 fi
 
 mkdir dune-copasi/test/build-cmake && cd dune-copasi/test/build-cmake
 
-echo "cmake $CMAKE_FALGS --build .."
-eval cmake $CMAKE_FALGS --build ..
+echo "cmake $CMAKE_FLAGS .."
+eval cmake $CMAKE_FLAGS ..
 
 cmake --target build_unit_tests
 ctest -j4 -L "unit" --output-on-failure
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cc1dddc6774ba1c2d916aca2572c30c11171281..ec308047e74c7bb83f4d26fa04171fc018706dd2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,8 +79,8 @@ stages:
   image: ${DEPENDENCIES_IMAGE}
   stage: build
   script:
+    - echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=$PWD/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi
     - cd ..
-    - echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=dune-copasi-install"' >> /duneci/cmake-flags/dune_copasi
     - bash dune-copasi/.ci/build.sh
   artifacts:
     paths:
@@ -92,13 +92,13 @@ stages:
   image: ${DEPENDENCIES_IMAGE}
   stage: unit_tests
   script:
-    - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=dune-copasi-install"' >> /duneci/cmake-flags/dune_copasi
-    - echo 'CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Debug"' >> /duneci/cmake-flags/dune_copasi
+    - echo 'CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Debug"' >> /duneci/cmake-flags/dune-copasi
+    - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=$PWD/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi
     - cd ..
     - bash dune-copasi/.ci/unit_tests.sh
   artifacts:
     paths:
-      - build-cmake/test
+      - test/build-cmake
     expire_in: 1 day
     when: always
   <<: *default_tags
@@ -107,12 +107,13 @@ stages:
   image: ${DEPENDENCIES_IMAGE}
   stage: system_tests
   script:
+    - echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH=$PWD/dune-copasi-install"' >> /duneci/cmake-flags/dune-copasi
     - cd ..
     - bash dune-copasi/.ci/system_tests.sh
   artifacts:
     paths:
       - cd ..
-      - build-cmake/test
+      - test/build-cmake
     expire_in: 1 day
     when: always
   <<: *default_tags
diff --git a/Dockerfile b/Dockerfile
index cbe6ebcd3fecbbc21af6621399afa18fcb7c1148..5673a2527b18e7acd53274715c69ec00679f0cf8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,11 +11,11 @@ ENV PATH=/duneci/install/bin:$PATH
 
 RUN    ln -s /duneci/toolchains/${TOOLCHAIN} /duneci/toolchain \
     && export PATH=/duneci/install/bin:$PATH
-RUN    echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_SETUP=1"' >> /duneci/cmake-flags/enable_virtualenv \
-    && echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_PATH=/duneci/install/dune-python-venv"' >> /duneci/cmake-flags/enable_virtualenv \
-    && echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH:PATH=/duneci/install"' >> /duneci/cmake-flags/install_path \
-    && echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX:PATH=/duneci/install"' >> /duneci/cmake-flags/install_path \
-    && echo 'CMAKE_FLAGS+=" -DCMAKE_GENERATOR="Ninja' >> /duneci/cmake-flags/cmake_generator
+RUN    echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_SETUP=1"' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DDUNE_PYTHON_VIRTUALENV_PATH=/duneci/install/dune-python-venv"' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DCMAKE_PREFIX_PATH:PATH=/duneci/install"' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX:PATH=/duneci/install"' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DCMAKE_GENERATOR="Ninja' >> /duneci/cmake-flags/dune-copasi
 WORKDIR /duneci/modules
 RUN mkdir -p /duneci/modules/dune-copasi/.ci
 COPY --chown=duneci ./.ci /duneci/modules/dune-copasi/.ci
@@ -27,10 +27,10 @@ FROM setup-env AS build-env
 ENV DUNE_OPTIONS_FILE=/duneci/dune.opts
 ENV PATH=/duneci/install/bin:$PATH
 
-RUN    echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_SD_EXECUTABLE=ON"' >> /duneci/cmake-flags/production \
-    && echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_MD_EXECUTABLE=ON"' >> /duneci/cmake-flags/production \
-    && echo 'CMAKE_FLAGS+=" -DCMAKE_CXX_FLAGS_RELEASE='"'"'-O3 -fvisibility=hidden -fpic -static-libstdc++'"'"' "' >> /duneci/cmake-flags/production \
-    && echo 'CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Release"' >> /duneci/cmake-flags/production
+RUN    echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_SD_EXECUTABLE=ON"' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DDUNE_COPASI_MD_EXECUTABLE=ON"' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DCMAKE_CXX_FLAGS_RELEASE='"'"'-O3 -fvisibility=hidden -fpic -static-libstdc++'"'"' "' >> /duneci/cmake-flags/dune-copasi \
+    && echo 'CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Release"' >> /duneci/cmake-flags/dune-copasi
 
 WORKDIR /duneci/modules
 COPY --chown=duneci ./ /duneci/modules/dune-copasi
diff --git a/cmake/modules/DuneCopasiCPack.cmake b/cmake/modules/DuneCopasiCPack.cmake
index 1df31229ffe4311e800d42f5b8cd5b13a059dbe5..0fc6358a3488073f478005df0533e0373afff9f9 100644
--- a/cmake/modules/DuneCopasiCPack.cmake
+++ b/cmake/modules/DuneCopasiCPack.cmake
@@ -10,4 +10,6 @@ set(CPACK_PACKAGE_VERSION_MAJOR "0")
 set(CPACK_PACKAGE_VERSION_MINOR "4")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
+
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libscotchparmetis-dev,libldl2,libspqr2,libumfpack5,libarpack++2c2a,libsuperlu5,libgmpxx4ldbl,libopenblas-base,libtiff5,libmuparser2v5")
 include(CPack)