diff --git a/build/base/Dockerfile b/build/base/Dockerfile
index 9e8363c0..af0c21a4 100644
--- a/build/base/Dockerfile
+++ b/build/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye
+FROM debian:bookworm
 
 ARG port=2222
 
diff --git a/build/base/intel-builder.Dockerfile b/build/base/intel-builder.Dockerfile
index 3510b995..f9072ad1 100644
--- a/build/base/intel-builder.Dockerfile
+++ b/build/base/intel-builder.Dockerfile
@@ -2,7 +2,7 @@ FROM bash AS downloader
 
 RUN wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB -O key.PUB
 
-FROM debian:bullseye
+FROM debian:bookworm
 
 COPY --from=downloader key.PUB /tmp/key.PUB
 
@@ -16,7 +16,7 @@ RUN apt update \
     && apt autoremove -y \
     && apt update \
     && apt install -y --no-install-recommends \
-        libstdc++-10-dev binutils procps clang \
+        libstdc++-12-dev binutils procps clang \
         intel-oneapi-compiler-dpcpp-cpp \
         intel-oneapi-mpi-devel \
     && rm -rf /var/lib/apt/lists/*
diff --git a/build/base/mpich-builder.Dockerfile b/build/base/mpich-builder.Dockerfile
index 5880b8aa..d6f25e93 100644
--- a/build/base/mpich-builder.Dockerfile
+++ b/build/base/mpich-builder.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye as builder
+FROM debian:bookworm as builder
 
 RUN apt update \
     && apt install -y --no-install-recommends \
diff --git a/build/base/openmpi-builder.Dockerfile b/build/base/openmpi-builder.Dockerfile
index 5cec38b2..a548d519 100644
--- a/build/base/openmpi-builder.Dockerfile
+++ b/build/base/openmpi-builder.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye as builder
+FROM debian:bookworm as builder
 
 RUN apt update \
     && apt install -y --no-install-recommends \
diff --git a/examples/v2beta1/pi/pi.cc b/examples/v2beta1/pi/pi.cc
index 381cea0b..fed4573a 100644
--- a/examples/v2beta1/pi/pi.cc
+++ b/examples/v2beta1/pi/pi.cc
@@ -46,6 +46,7 @@ int main(int argc, char *argv[]) {
     double pi = 4 * (double)total_count / (double)(worker_tests) / (double)(workers);
     printf("pi is approximately %.16lf\n", pi);
   }
+  MPI_Barrier(MPI_COMM_WORLD);
   MPI_Finalize();
   return 0;
 }