diff --git a/docker/Dockerfile-ubuntu-24.04 b/docker/Dockerfile-ubuntu-24.04
index c19379e..7ff7f7f 100644
--- a/docker/Dockerfile-ubuntu-24.04
+++ b/docker/Dockerfile-ubuntu-24.04
@@ -66,7 +66,7 @@ RUN apt-get update && \
         python3-pint \
         python3-pip \
         python3-pycodestyle \
-        python3-requests  \
+        python3-requests \
         python3-scipy \
         python3-setuptools \
         python3-sphinx \
@@ -88,7 +88,7 @@ ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
 ENV JUPYTER_PLATFORM_DIRS 1
 
-RUN useradd -m espresso
+RUN userdel ubuntu && rm -rf /home/ubuntu && useradd -u 1000 -m espresso
 ENV HOME="/home/espresso"
 RUN echo | cpan && \
     echo | cpan JSON::XS && \
diff --git a/docker/Dockerfile-ubuntu-wo-dependencies b/docker/Dockerfile-ubuntu-wo-dependencies
index 2c3f8d7..83ed7f3 100644
--- a/docker/Dockerfile-ubuntu-wo-dependencies
+++ b/docker/Dockerfile-ubuntu-wo-dependencies
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy AS image_base
+FROM ubuntu:noble AS image_base
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
         apt-utils \
@@ -7,10 +7,14 @@ RUN apt-get update && \
         ccache \
         cmake \
         cython3 \
-        gcc-11 g++-11 \
+        gcc-13 g++-13 \
         gdb \
         git \
-        libboost-dev libboost-serialization-dev libboost-mpi-dev libboost-filesystem-dev libboost-test-dev \
+        libboost-dev \
+        libboost-filesystem-dev \
+        libboost-mpi-dev \
+        libboost-serialization-dev \
+        libboost-test-dev \
         libopenmpi-dev \
         openssh-client \
         openmpi-bin \