diff --git a/docker-images/base/Dockerfile b/docker-images/base/Dockerfile
index b470315..1e220f7 100644
--- a/docker-images/base/Dockerfile
+++ b/docker-images/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim as unison
+FROM debian:bookworm-slim as unison
 RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \
@@ -14,7 +14,7 @@ RUN \
   cd /tmp/unison-2.53.3 && \
   make
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 RUN \
   set -x && \
diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml
index 3faaf4d..08922cc 100644
--- a/docker-images/controller/provision.yml
+++ b/docker-images/controller/provision.yml
@@ -25,7 +25,7 @@
           enabled: false
     - ce_provision:
         own_repository: https://github.com/codeenigma/ce-provision.git
-        own_repository_branch: 1.x
+        own_repository_branch: 2.x
         own_repository_skip_checkout: false
         config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git
         config_repository_branch: 1.x
diff --git a/docker-images/dind/Dockerfile b/docker-images/dind/Dockerfile
index 513281d..2c3b99b 100644
--- a/docker-images/dind/Dockerfile
+++ b/docker-images/dind/Dockerfile
@@ -9,11 +9,11 @@ RUN \
 RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \  
-  echo 'deb [arch=amd64] https://download.docker.com/linux/debian buster stable' > /etc/apt/sources.list.d/docker.list && \
+  echo 'deb [arch=amd64] https://download.docker.com/linux/debian bookworm stable' > /etc/apt/sources.list.d/docker.list && \
   curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
   apt-get update && \
   apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew" && \
   apt-get install -y -o Dpkg::Options::="--force-confnew" docker-ce && \
   rm -rf /tmp/* && \
   rm -rf /var/lib/apt/lists/* && \
-  apt-get clean
\ No newline at end of file
+  apt-get clean
diff --git a/docker-images/export.sh b/docker-images/export.sh
index 80f1ea6..921f0d8 100755
--- a/docker-images/export.sh
+++ b/docker-images/export.sh
@@ -27,7 +27,7 @@ fi
 OWN_DIR=$( cd "$( dirname "$OWN" )" && pwd -P)
 
 # Ensure we have a fresh image to start with.
-docker image pull debian:bullseye-slim
+docker image pull debian:bookworm-slim
 
 # Build base image.
 echo "Building base image."