diff --git a/ci/cscs-ci.yml b/ci/cscs-ci.yml
index ddc293ff8d..47eaec4f17 100644
--- a/ci/cscs-ci.yml
+++ b/ci/cscs-ci.yml
@@ -4,7 +4,7 @@ include:
 stages:
   - build_deps
   - build_cp2k
-  - test_cp2k
+#  - test_cp2k
 
 variables:
   PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/cp2k:$CI_COMMIT_SHORT_SHA
@@ -23,14 +23,14 @@ build_cp2k_job:
   variables:
     DOCKERFILE: ci/docker/build_cp2k_psmp.Dockerfile
 
-test_cp2k_job:
-  extends: .container-runner-eiger
-  stage: test_cp2k
-  timeout: 2 hours
-  image: $PERSIST_IMAGE_NAME
-  script:
-    - /opt/cp2k/tools/docker/scripts/test_regtest_cmake.sh toolchain psmp
-  variables:
-    OMP_NUM_THREADS: 2
-    SLURM_NTASKS: 64
-    SLURM_TIMELIMIT: "60:00"
+#test_cp2k_job:
+#  extends: .container-runner-eiger
+#  stage: test_cp2k
+#  timeout: 2 hours
+#  image: $PERSIST_IMAGE_NAME
+#  script:
+#    - /opt/cp2k/tools/docker/scripts/test_regtest_cmake.sh toolchain psmp
+#  variables:
+#    OMP_NUM_THREADS: 2
+#    SLURM_NTASKS: 64
+#    SLURM_TIMELIMIT: "60:00"
diff --git a/ci/docker/build_cp2k_psmp.Dockerfile b/ci/docker/build_cp2k_psmp.Dockerfile
index e69de29bb2..3e4e0a428b 100644
--- a/ci/docker/build_cp2k_psmp.Dockerfile
+++ b/ci/docker/build_cp2k_psmp.Dockerfile
@@ -0,0 +1,14 @@
+WORKDIR /opt/cp2k
+COPY ./src ./src
+COPY ./data ./data
+COPY ./tests ./tests
+COPY ./tools/build_utils ./tools/build_utils
+COPY ./cmake ./cmake
+COPY ./CMakeLists.txt .
+
+# Build CP2K with CMake and run regression tests
+COPY ./tools/docker/scripts/build_cp2k_cmake.sh ./
+RUN /bin/bash -o pipefail -c " \
+    ./build_cp2k_cmake.sh toolchain psmp |& tee build_cp2k.log"
+
+#EOF
diff --git a/ci/docker/build_deps_psmp.Dockerfile b/ci/docker/build_deps_psmp.Dockerfile
index c4acde9a5d..c9414447a3 100644
--- a/ci/docker/build_deps_psmp.Dockerfile
+++ b/ci/docker/build_deps_psmp.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM ubuntu:24.04 AS build
 
 # Install requirements for the toolchain
 WORKDIR /opt/cp2k-toolchain