diff --git a/ci/cscs_daint_spack_psmp.yaml b/ci/cscs_daint_spack_psmp.yaml
index 3899f99940..4155c6d751 100644
--- a/ci/cscs_daint_spack_psmp.yaml
+++ b/ci/cscs_daint_spack_psmp.yaml
@@ -82,7 +82,7 @@ regression test cp2k daint:
   timeout: 1h
   script:
     - git --no-pager log -1 --pretty="%nCommitSHA:%x20%H%nCommitTime:%x20%ci%nCommitAuthor:%x20%an%nCommitSubject:%x20%s%n"
-    - podman run --shm-size=1g -v ${PWD}:/mnt ${DOCKERHUB_IMAGE_NAME} /opt/cp2k/tests/do_regtest.py --cp2kdatadir /opt/cp2k/share/cp2k/data --maxtasks ${SLURM_NTASKS} --mpiexec "mpiexec -bind-to none" --keepalive /opt/cp2k/bin ${VERSION} 2>&1 || true
+    - podman run --shm-size=1g -v ${PWD}:/mnt ${DOCKERHUB_IMAGE_NAME} /opt/cp2k/tests/do_regtest.py --cp2kdatadir /opt/cp2k/install/share/cp2k/data --maxtasks ${SLURM_NTASKS} --mpiexec "mpiexec -bind-to none" --keepalive /opt/cp2k/install/bin ${VERSION} 2>&1 || true
   variables:
     SLURM_DEBUG: 1
     SLURM_HINT: nomultithread
@@ -98,7 +98,7 @@ benchmark cp2k 1 daint node:
   timeout: 1h
   image: ${CSCS_IMAGE_NAME}
   before_script:
-    - export CP2K_DATA_DIR=/opt/cp2k/share/cp2k/data
+    - export CP2K_DATA_DIR=/opt/cp2k/install/share/cp2k/data
   script:
     - cp2k /opt/cp2k/benchmarks/CI/H2O-512_md.inp
   variables:
diff --git a/ci/cscs_eiger_spack_psmp.yaml b/ci/cscs_eiger_spack_psmp.yaml
index 8e7721c0aa..76460b4318 100644
--- a/ci/cscs_eiger_spack_psmp.yaml
+++ b/ci/cscs_eiger_spack_psmp.yaml
@@ -83,7 +83,7 @@ regression test cp2k eiger:
   timeout: 1h
   script:
     - git --no-pager log -1 --pretty="%nCommitSHA:%x20%H%nCommitTime:%x20%ci%nCommitAuthor:%x20%an%nCommitSubject:%x20%s%n"
-    - podman run --shm-size=1g -v ${PWD}:/mnt ${DOCKERHUB_IMAGE_NAME} /opt/cp2k/tests/do_regtest.py --cp2kdatadir /opt/cp2k/share/cp2k/data --maxtasks ${SLURM_NTASKS} --mpiexec "mpiexec -bind-to none" --keepalive /opt/cp2k/bin ${VERSION} 2>&1 || true
+    - podman run --shm-size=1g -v ${PWD}:/mnt ${DOCKERHUB_IMAGE_NAME} /opt/cp2k/tests/do_regtest.py --cp2kdatadir /opt/cp2k/install/share/cp2k/data --maxtasks ${SLURM_NTASKS} --mpiexec "mpiexec -bind-to none" --keepalive /opt/cp2k/install/bin ${VERSION} 2>&1 || true
   variables:
     SLURM_CONSTRAINT: mc
     SLURM_DEBUG: 1
@@ -100,7 +100,7 @@ benchmark cp2k 1 eiger node:
   timeout: 1h
   image: ${CSCS_IMAGE_NAME}
   before_script:
-    - export CP2K_DATA_DIR=/opt/cp2k/share/cp2k/data
+    - export CP2K_DATA_DIR=/opt/cp2k/install/share/cp2k/data
   script:
     - cp2k /opt/cp2k/benchmarks/CI/H2O-128_md.inp
   variables:
@@ -122,7 +122,7 @@ benchmark cp2k 2 eiger nodes:
   timeout: 1h
   image: ${CSCS_IMAGE_NAME}
   before_script:
-    - export CP2K_DATA_DIR=/opt/cp2k/share/cp2k/data
+    - export CP2K_DATA_DIR=/opt/cp2k/install/share/cp2k/data
   script:
     - cp2k /opt/cp2k/benchmarks/CI/H2O-512_md.inp
   variables:
diff --git a/ci/cscs_eiger_spack_ssmp.yaml b/ci/cscs_eiger_spack_ssmp.yaml
index c3baa53718..1f7ca4107c 100644
--- a/ci/cscs_eiger_spack_ssmp.yaml
+++ b/ci/cscs_eiger_spack_ssmp.yaml
@@ -81,7 +81,7 @@ regression test cp2k eiger:
   timeout: 1h
   script:
     - git --no-pager log -1 --pretty="%nCommitSHA:%x20%H%nCommitTime:%x20%ci%nCommitAuthor:%x20%an%nCommitSubject:%x20%s%n"
-    - podman run --shm-size=1g -v ${PWD}:/mnt ${DOCKERHUB_IMAGE_NAME} /opt/cp2k/tests/do_regtest.py --cp2kdatadir /opt/cp2k/share/cp2k/data --maxtasks ${SLURM_NTASKS} --mpiexec "mpiexec -bind-to none" --keepalive /opt/cp2k/bin ${VERSION} 2>&1 || true
+    - podman run --shm-size=1g -v ${PWD}:/mnt ${DOCKERHUB_IMAGE_NAME} /opt/cp2k/tests/do_regtest.py --cp2kdatadir /opt/cp2k/install/share/cp2k/data --maxtasks ${SLURM_NTASKS} --mpiexec "mpiexec -bind-to none" --keepalive /opt/cp2k/install/bin ${VERSION} 2>&1 || true
   variables:
     SLURM_CONSTRAINT: mc
     SLURM_DEBUG: 1