diff --git a/docker/Dockerfile-debian b/docker/Dockerfile-debian
index 6b196a7..8e46be1 100644
--- a/docker/Dockerfile-debian
+++ b/docker/Dockerfile-debian
@@ -1,4 +1,4 @@
-FROM debian:bookworm AS image_base
+FROM debian:trixie AS image_base
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         apt-utils \
@@ -7,7 +7,7 @@ RUN apt-get update && \
         ccache \
         curl \
         cython3 \
-        gcc-12 g++-12 \
+        gcc-14 g++-14 \
         gdb \
         git \
         libboost-dev \
@@ -16,8 +16,10 @@ RUN apt-get update && \
         libboost-serialization-dev \
         libboost-test-dev \
         libfftw3-dev \
+        libfftw3-mpi-dev \
         libhdf5-openmpi-dev \
         libpython3-dev \
+        ninja-build \
         openmpi-bin \
         python3 \
         python3-h5py \
@@ -26,6 +28,7 @@ RUN apt-get update && \
         python3-pip \
         python3-scipy \
         python3-setuptools \
+        python3-venv \
         python3-vtk9 \
         vim && \
     apt-get clean && \
diff --git a/docker/Dockerfile-fedora b/docker/Dockerfile-fedora
index 8cb6f9b..0c5a422 100644
--- a/docker/Dockerfile-fedora
+++ b/docker/Dockerfile-fedora
@@ -1,4 +1,4 @@
-FROM fedora:41
+FROM fedora:42
 RUN dnf -y install \
   blas-devel \
   boost-devel \
@@ -17,6 +17,8 @@ RUN dnf -y install \
   lapack-devel \
   make \
   mpich-devel \
+  ninja-build \
+  patch \
   python3 \
   python3-devel \
   python3-Cython \
diff --git a/docker/Dockerfile-ubuntu b/docker/Dockerfile-ubuntu
index 90725e6..2f69fa5 100644
--- a/docker/Dockerfile-ubuntu
+++ b/docker/Dockerfile-ubuntu
@@ -5,6 +5,7 @@ RUN apt-get update && \
         autoconf \
         automake \
         build-essential \
+        ca-certificates \
         ccache \
         clang-19 clang-tidy-19 clang-format-19 llvm-19 libclang-rt-19-dev libomp-19-dev \
         cmake \
@@ -41,6 +42,7 @@ RUN apt-get update && \
         libopenmpi-dev \
         libthrust-dev \
         libtool \
+        ninja-build \
         nvidia-cuda-toolkit \
         openmpi-bin \
         openssh-client \
@@ -83,11 +85,9 @@ RUN apt-get update && \
 
 COPY install-pfft.sh /tmp
 COPY install-scafacos.sh /tmp
-COPY install-kokkos.sh /tmp
 
 RUN sh /tmp/install-pfft.sh     && rm /tmp/install-pfft.sh && \
     sh /tmp/install-scafacos.sh && rm /tmp/install-scafacos.sh && \
-    sh /tmp/install-kokkos.sh   && rm /tmp/install-kokkos.sh && \
     ldconfig
 
 ENV NVIDIA_VISIBLE_DEVICES=all
diff --git a/docker/Dockerfile-ubuntu-wo-dependencies b/docker/Dockerfile-ubuntu-wo-dependencies
index 90a3c2d..44e4631 100644
--- a/docker/Dockerfile-ubuntu-wo-dependencies
+++ b/docker/Dockerfile-ubuntu-wo-dependencies
@@ -3,6 +3,7 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
         apt-utils \
         build-essential \
+        ca-certificates \
         curl \
         ccache \
         cmake \
@@ -16,6 +17,7 @@ RUN apt-get update && \
         libboost-serialization-dev \
         libboost-test-dev \
         libopenmpi-dev \
+        ninja-build \
         openssh-client \
         openmpi-bin \
         python3 \
diff --git a/docker/install-kokkos.sh b/docker/install-kokkos.sh
deleted file mode 100644
index 0954460..0000000
--- a/docker/install-kokkos.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd /tmp
-
-kokkos_version="4.3.00"
-curl -Lo ./kokkos-${kokkos_version}.tar.gz https://github.com/kokkos/kokkos/archive/refs/tags/${kokkos_version}.tar.gz
-tar xfz ./kokkos-${kokkos_version}.tar.gz
-rm ./kokkos-${kokkos_version}.tar.gz
-cd kokkos-${kokkos_version}/
-mkdir build
-cd build/
-cmake ..  -D Kokkos_ENABLE_CUDA=OFF -DKokkos_ENABLE_OPENMP=ON -D CMAKE_POSITION_INDEPENDENT_CODE=ON
-make -j $(nproc) install
-cd
-rm -r /tmp/kokkos-${kokkos_version}
-ldconfig