diff --git a/.VERSION b/.VERSION
index 7bc0d81..07aa000 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v8.1.0-beta.4
\ No newline at end of file
+v9.0.0-beta.1
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3860a11..fb5478e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## Changelog
 
+### v9.0.0-beta.1 (coming soon)
+* updating base image to debian 12 (bookworm)
+* improve security by avoiding running commands as root
+* integrate calling maintenance script into iobroker command
+* move container config files location
+
 ### v8.1.0-beta.4 (29.07.2023)
 * fix container restart in maintenance script 
 * fix running maintenance script as iobroker
diff --git a/debian12/Dockerfile b/debian12/Dockerfile
index 26e3fa2..c9049e4 100644
--- a/debian12/Dockerfile
+++ b/debian12/Dockerfile
@@ -7,17 +7,18 @@ LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
       org.opencontainers.image.url="https://github.com/buanet/ioBroker.docker" \
       org.opencontainers.image.source="https://github.com/buanet/ioBroker.docker" \
       org.opencontainers.image.base.name="debian:bookworm-slim" \
-      org.opencontainers.image.version="v9.0.0-testing" \
-      org.opencontainers.image.created="00-00-00"
+      org.opencontainers.image.version="${VERSION}" \
+      org.opencontainers.image.created="${DATI}"
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Copy scripts
+# Copy files
 COPY scripts /opt/scripts
 COPY userscripts /opt/userscripts
 
-# Install prerequisites (including node) and generating locales
+# Set up ioBroker
 RUN apt-get update && apt-get upgrade -y \
+    # Install prerequisites
     && apt-get install -y \
     apt-utils \
     cifs-utils \
@@ -30,13 +31,12 @@ RUN apt-get update && apt-get upgrade -y \
     procps \
     python3 \
     python3-dev \
-    #sudo \
     tar \
     tzdata \
     udev \
     wget \
     # Install node
-    && curl -sL https://deb.nodesource.com/setup_18.x | bash - \
+    && curl -sL https://deb.nodesource.com/setup_${NODE}.x | bash - \
     && apt-get update && apt-get install -y nodejs \
     # Install node-gyp
     && npm install --production -g node-gyp \
@@ -52,7 +52,7 @@ RUN apt-get update && apt-get upgrade -y \
     # Prepare old .docker_config (needed until changed in iobroker)
     && mkdir /opt/scripts/.docker_config \
     && echo "v9.0.0-testing" > /opt/scripts/.docker_config/.thisisdocker \
-    # Run installer
+    # Run iobroker installer
     && curl -sL https://iobroker.net/install.sh | bash - \
     # Deleting UUID from build
     && iobroker unsetup -y \
@@ -78,7 +78,7 @@ RUN apt-get update && apt-get upgrade -y \
     && apt-get clean \
     && rm -rf /tmp/* /var/tmp/* /root/.cache/* /root/.npm/* /var/lib/apt/lists/*
 
-# Setting up default ENVs
+# Default environment variables
 ENV DEBIAN_FRONTEND="teletype" \
     LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE:de" \
@@ -87,7 +87,7 @@ ENV DEBIAN_FRONTEND="teletype" \
     SETUID=1000 \
     TZ="Europe/Berlin"
 
-# Expose default admin ui port
+# Default admin ui port
 EXPOSE 8081
 
 # Change work dir
@@ -97,7 +97,7 @@ WORKDIR /opt/iobroker/
 HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
     CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
 
-# Volumes for persistent data
+# Volume for persistent data
 VOLUME ["/opt/iobroker"]
 
 # Run startup-script