diff --git a/.github/workflows/build-debian-image-dev.yml b/.github/workflows/build-debian-image-dev.yml
deleted file mode 100644
index 209d63a..0000000
--- a/.github/workflows/build-debian-image-dev.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-# Github action to build Docker image from dev branch (tag: dev)
-name: Build debian dev
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-dev-image:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3.5.3
-        with:
-          repository: 'buanet/ioBroker.docker'
-
-      - name: Fetch version tag and date
-        id: version
-        run: |
-          VERSION="$(cat .VERSION)"
-          MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')"
-          DATI="$(date --rfc-3339=seconds | sed 's/ /T/')"
-          echo "This is the Version: $VERSION"
-          echo "version=$VERSION" >> $GITHUB_ENV
-          echo "This is the Major Version: $MAJORVERSION"
-          echo "majorversion=$MAJORVERSION" >> $GITHUB_ENV
-          echo "This is the Buildnumber/Timestamp: $DATI"
-          echo "dati=$DATI" >> $GITHUB_ENV
-          # startup script
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian/scripts/iobroker_startup.sh > ./debian/scripts/iobroker_startup.tmp
-          mv -f ./debian/scripts/iobroker_startup.tmp ./debian/scripts/iobroker_startup.sh
-          # amd64
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./debian/node18/Dockerfile > ./debian/node18/Dockerfile.tmp 
-          mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.2.0
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2.9.1
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2.2.0
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ secrets.PACKAGES_USER }}
-          password: ${{ secrets.PACKAGES_PASS }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v4.1.1
-        with:
-          context: ./debian
-          file: ./debian/node18/Dockerfile
-          push: true
-          platforms: |
-            linux/amd64
-            linux/arm/v7
-            linux/arm64/v8
-          tags: |
-            buanet/iobroker:dev,
-            ghcr.io/buanet/iobroker:dev
-          provenance: false
-          outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Official Docker image for ioBroker smarthome software (https://www.iobroker.net)
-
-      - name: Delete untagged images from GitHub Container Registry
-        uses: actions/github-script@v6.4.1
-        with:
-          github-token: ${{ secrets.PACKAGES_PASS }}
-          script: |
-            const response = await github.request("GET /users/${{ env.OWNER }}/packages/container/${{ env.PACKAGE_NAME }}/versions",
-              { per_page: ${{ env.PER_PAGE }}
-            });
-            for(version of response.data) {
-                if (version.metadata.container.tags.length == 0) {
-                    console.log("delete " + version.id)
-                    const deleteResponse = await github.request("DELETE /user/packages/container/${{ env.PACKAGE_NAME }}/versions/" + version.id, { });
-                    console.log("status " + deleteResponse.status)
-                }
-            }
-        env:
-          OWNER: buanet
-          PACKAGE_NAME: iobroker
-          PER_PAGE: 100
diff --git a/.github/workflows/build-debian-image-dev-node20.yml b/.github/workflows/build-debian12-dev-node20.yml
similarity index 70%
rename from .github/workflows/build-debian-image-dev-node20.yml
rename to .github/workflows/build-debian12-dev-node20.yml
index 6baccb2..c07a814 100644
--- a/.github/workflows/build-debian-image-dev-node20.yml
+++ b/.github/workflows/build-debian12-dev-node20.yml
@@ -1,5 +1,5 @@
-# Github action to build Docker image from dev branch (tag: dev)
-name: Build debian dev-node20
+# Github action to build Debian12 image (Tag: dev-node20)
+name: Build Debian 12 Image (dev-node20)
 
 on:
   workflow_dispatch:
@@ -9,35 +9,38 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.6.0
         with:
           repository: 'buanet/ioBroker.docker'
 
-      - name: Fetch version tag and date
-        id: version
+      - name: Set job variables
         run: |
+          NODE="20"
           VERSION="$(cat .VERSION)"
           MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')"
           DATI="$(date --rfc-3339=seconds | sed 's/ /T/')"
-          echo "This is the Version: $VERSION"
+          # Log output and export as Github environment variable
+          echo "[LOG] Nodejs Version: $NODE"
+          echo "node=$NODE" >> $GITHUB_ENV
+          echo "[LOG] Image Version: $VERSION"
           echo "version=$VERSION" >> $GITHUB_ENV
-          echo "This is the Major Version: $MAJORVERSION"
+          echo "[LOG] Major Image Version: $MAJORVERSION"
           echo "majorversion=$MAJORVERSION" >> $GITHUB_ENV
-          echo "This is the Buildnumber/Timestamp: $DATI"
+          echo "[LOG] Buildnumber/Timestamp: $DATI"
           echo "dati=$DATI" >> $GITHUB_ENV
-          # startup script
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian/scripts/iobroker_startup.sh > ./debian/scripts/iobroker_startup.tmp
-          mv -f ./debian/scripts/iobroker_startup.tmp ./debian/scripts/iobroker_startup.sh
-          # amd64
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./debian/node20/Dockerfile > ./debian/node20/Dockerfile.tmp 
-          mv -f ./debian/node20/Dockerfile.tmp ./debian/node20/Dockerfile
+          # Set values in iobroker_startup.sh
+          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp
+          mv -f ./debian12/scripts/iobroker_startup.tmp ./debian12/scripts/iobroker_startup.sh
+          # Set values in Dockerfile
+          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/$NODE/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
+          mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.9.1
+        uses: docker/setup-buildx-action@v2.10.0
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.2.0
@@ -52,11 +55,11 @@ jobs:
           username: ${{ secrets.PACKAGES_USER }}
           password: ${{ secrets.PACKAGES_PASS }}
 
-      - name: Build Docker image (node20)
+      - name: Build and push Docker image
         uses: docker/build-push-action@v4.1.1
         with:
-          context: ./debian
-          file: ./debian/node20/Dockerfile
+          context: ./debian12
+          file: ./debian12/Dockerfile
           push: true
           platforms: |
             linux/amd64
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dada72..9c82a00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Changelog
 
 ### v9.0.0-beta.1 (coming soon)
+* cleanup/ restructure repo
 * update nodejs setup process
 * update base image to debian 12 (bookworm)
 * improve security by avoiding running commands as root
diff --git a/debian/Dockerfile b/debian/Dockerfile
deleted file mode 100644
index fe96e42..0000000
--- a/debian/Dockerfile
+++ /dev/null
@@ -1,102 +0,0 @@
-FROM ${BASE_IMAGE}
-
-LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
-      org.opencontainers.image.description="Official Docker image for ioBroker smarthome software (https://www.iobroker.net)" \
-      org.opencontainers.image.documentation="https://github.com/buanet/ioBroker.docker#readme" \
-      org.opencontainers.image.authors="André Germann <info@buanet.de>" \
-      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="${BASE_IMAGE}" \
-      org.opencontainers.image.version="${VERSION}" \
-      org.opencontainers.image.created="${DATI}"
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Install prerequisites (including node) and generating locales
-RUN apt-get update && apt-get install -y \
-    apt-utils \
-    cifs-utils \
-    curl \
-    gosu \
-    iputils-ping \
-    jq \
-    locales \
-    nfs-common \
-    procps \
-    python3 \
-    python3-dev \
-    sudo \
-    tar \
-    tzdata \
-    udev \
-    wget \
-    # Install node
-    && curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash \
-    && apt-get update && apt-get install -y nodejs \
-    # Install node-gyp
-    && npm install -g node-gyp \
-    # Generating locales
-    && sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
-    && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
-    && locale-gen \
-    # Change permissions for scripts
-    #&& chmod 777 /opt/scripts/ \
-    #&& chmod 777 /opt/userscripts/ \
-    #&& chmod +x /opt/scripts/*.sh \
-    #&& chmod +x /opt/userscripts/*.sh \
-    # Prepare
-    && mkdir -p /opt/.docker_config/ \
-    && echo "starting" > /opt/.docker_config/.healthcheck \
-    && echo "${VERSION}" > /opt/.docker_config/.thisisdocker \
-    && echo "true" > /opt/.docker_config/.first_run \
-    # Run installer
-    && curl -sL https://iobroker.net/install.sh | bash - \
-    # Deleting UUID from build
-    && iobroker unsetup -y \
-    && echo "true" > /opt/iobroker/.fresh_install \
-    # Backup initial ioBroker and userscript folder
-    && tar -cf /opt/initial_iobroker.tar /opt/iobroker \
-    && tar -cf /opt/initial_userscripts.tar /opt/userscripts \
-    # Setting up iobroker-user (shell, home dir and rights)
-    && chsh -s /bin/bash iobroker \
-    && usermod --home /opt/iobroker iobroker \
-    && usermod -u 1000 iobroker \
-    && groupmod -g 1000 iobroker \
-    && chown root:iobroker /usr/sbin/gosu \
-    && chmod +s /usr/sbin/gosu \
-    # Clean up installation cache
-    && apt-get autoclean -y \
-    && apt-get autoremove \
-    && apt-get clean \
-    && rm -rf /tmp/* /var/tmp/* \
-    && rm -rf /root/.cache/* /root/.npm/* \
-    && rm -rf /var/lib/apt/lists/*
-
-# Copy scripts
-COPY --chown iobroker:iobroker --chmod 544 scripts /opt/scripts
-COPY --chown iobroker:iobroker --chmod 544 userscripts /opt/userscripts
-
-# Setting up default ENVs
-ENV DEBIAN_FRONTEND="teletype" \
-    LANG="de_DE.UTF-8" \
-    LANGUAGE="de_DE:de" \
-    LC_ALL="de_DE.UTF-8" \
-    SETGID=1000 \
-    SETUID=1000 \
-    TZ="Europe/Berlin"
-
-# Expose default admin ui port
-EXPOSE 8081
-
-# Change work dir
-WORKDIR /opt/iobroker/
-
-# Healthcheck
-HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
-    CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
-
-# Volumes for persistent data
-VOLUME ["/opt/iobroker"]
-
-# Run startup-script
-ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/debian/node12/Dockerfile b/debian/node12/Dockerfile
deleted file mode 100644
index fe2edfd..0000000
--- a/debian/node12/Dockerfile
+++ /dev/null
@@ -1,97 +0,0 @@
-FROM debian:bullseye-slim
-
-LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
-      org.opencontainers.image.description="Officical Docker image for ioBroker smarthome software (https://www.iobroker.net)" \
-      org.opencontainers.image.documentation="https://github.com/buanet/ioBroker.docker#readme" \
-      org.opencontainers.image.authors="André Germann <info@buanet.de>" \
-      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="docker.io/library/debian:bullseye-slim" \
-      org.opencontainers.image.version="${VERSION}" \
-      org.opencontainers.image.created="${DATI}"
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Install prerequisites (including node) and generating locales
-RUN apt-get update && apt-get install -y \
-    apt-utils \
-    cifs-utils \
-    curl \
-    gosu \
-    iputils-ping \
-    jq \
-    locales \
-    nfs-common \
-    procps \
-    python3 \
-    python3-dev \
-    sudo \
-    tar \
-    tzdata \
-    udev \
-    wget \
-    # Install node
-    && curl -sL https://deb.nodesource.com/setup_12.x | bash \
-    && apt-get update && apt-get install -y nodejs \
-    # Install node-gyp
-    && npm install -g node-gyp \
-    # Generating locales
-    && sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
-    && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
-    && locale-gen
-
-# Create directorys and copy scripts
-COPY scripts /opt/scripts
-COPY userscripts /opt/userscripts
-RUN chmod 777 /opt/scripts/ \
-    && chmod 777 /opt/userscripts/ \
-    && chmod +x /opt/scripts/*.sh \
-    && chmod +x /opt/userscripts/*.sh
-
-# Install ioBroker
-RUN curl -sL https://iobroker.net/install.sh | bash - \
-    && mkdir -p /opt/scripts/.docker_config/ \
-    && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
-    && echo "${VERSION}" > /opt/scripts/.docker_config/.thisisdocker \
-    && echo $(hostname) > /opt/.firstrun \
-    # Deleting UUID from build
-    && iobroker unsetup -y \
-    # Backup initial ioBroker and userscript folder
-    && tar -cf /opt/initial_iobroker.tar /opt/iobroker \
-    && tar -cf /opt/initial_userscripts.tar /opt/userscripts \
-    # Setting up iobroker-user (shell, home dir and rights)
-    && chsh -s /bin/bash iobroker \
-    && usermod --home /opt/iobroker iobroker \
-    && usermod -u 1000 iobroker \
-    && groupmod -g 1000 iobroker \
-    && chown root:iobroker /usr/sbin/gosu \
-    && chmod +s /usr/sbin/gosu \
-    # Clean up installation cache
-    && apt-get autoclean -y \
-    && apt-get autoremove \
-    && apt-get clean \
-    && rm -rf /tmp/* /var/tmp/* \
-    && rm -rf /root/.cache/* /root/.npm/* \
-    && rm -rf /var/lib/apt/lists/*
-
-# Setting up default ENVs
-ENV DEBIAN_FRONTEND="teletype" \
-    LANG="de_DE.UTF-8" \
-    LANGUAGE="de_DE:de" \
-    LC_ALL="de_DE.UTF-8" \
-    SETGID=1000 \
-    SETUID=1000 \
-    TZ="Europe/Berlin"
-
-# Expose default admin ui port
-EXPOSE 8081
-
-# Change work dir
-WORKDIR /opt/iobroker/
-
-# Healthcheck
-HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
-    CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
-
-# Run startup-script
-ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/debian/node14/Dockerfile b/debian/node14/Dockerfile
deleted file mode 100644
index 694bfb0..0000000
--- a/debian/node14/Dockerfile
+++ /dev/null
@@ -1,97 +0,0 @@
-FROM debian:bullseye-slim
-
-LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
-      org.opencontainers.image.description="Officical Docker image for ioBroker smarthome software (https://www.iobroker.net)" \
-      org.opencontainers.image.documentation="https://github.com/buanet/ioBroker.docker#readme" \
-      org.opencontainers.image.authors="André Germann <info@buanet.de>" \
-      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="docker.io/library/debian:bullseye-slim" \
-      org.opencontainers.image.version="${VERSION}" \
-      org.opencontainers.image.created="${DATI}"
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Install prerequisites (including node) and generating locales
-RUN apt-get update && apt-get install -y \
-    apt-utils \
-    cifs-utils \
-    curl \
-    gosu \
-    iputils-ping \
-    jq \
-    locales \
-    nfs-common \
-    procps \
-    python3 \
-    python3-dev \
-    sudo \
-    tar \
-    tzdata \
-    udev \
-    wget \
-    # Install node
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash \
-    && apt-get update && apt-get install -y nodejs \
-    # Install node-gyp
-    && npm install -g node-gyp \
-    # Generating locales
-    && sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
-    && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
-    && locale-gen
-
-# Create directorys and copy scripts
-COPY scripts /opt/scripts
-COPY userscripts /opt/userscripts
-RUN chmod 777 /opt/scripts/ \
-    && chmod 777 /opt/userscripts/ \
-    && chmod +x /opt/scripts/*.sh \
-    && chmod +x /opt/userscripts/*.sh
-
-# Install ioBroker
-RUN curl -sL https://iobroker.net/install.sh | bash - \
-    && mkdir -p /opt/scripts/.docker_config/ \
-    && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
-    && echo "${VERSION}" > /opt/scripts/.docker_config/.thisisdocker \
-    && echo $(hostname) > /opt/.firstrun \
-    # Deleting UUID from build
-    && iobroker unsetup -y \
-    # Backup initial ioBroker and userscript folder
-    && tar -cf /opt/initial_iobroker.tar /opt/iobroker \
-    && tar -cf /opt/initial_userscripts.tar /opt/userscripts \
-    # Setting up iobroker-user (shell, home dir and rights)
-    && chsh -s /bin/bash iobroker \
-    && usermod --home /opt/iobroker iobroker \
-    && usermod -u 1000 iobroker \
-    && groupmod -g 1000 iobroker \
-    && chown root:iobroker /usr/sbin/gosu \
-    && chmod +s /usr/sbin/gosu \
-    # Clean up installation cache
-    && apt-get autoclean -y \
-    && apt-get autoremove \
-    && apt-get clean \
-    && rm -rf /tmp/* /var/tmp/* \
-    && rm -rf /root/.cache/* /root/.npm/* \
-    && rm -rf /var/lib/apt/lists/*
-
-# Setting up default ENVs
-ENV DEBIAN_FRONTEND="teletype" \
-    LANG="de_DE.UTF-8" \
-    LANGUAGE="de_DE:de" \
-    LC_ALL="de_DE.UTF-8" \
-    SETGID=1000 \
-    SETUID=1000 \
-    TZ="Europe/Berlin"
-
-# Expose default admin ui port
-EXPOSE 8081
-
-# Change work dir
-WORKDIR /opt/iobroker/
-
-# Healthcheck
-HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
-    CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
-
-# Run startup-script
-ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/debian/node20/Dockerfile b/debian/node20/Dockerfile
deleted file mode 100644
index 08c0f1a..0000000
--- a/debian/node20/Dockerfile
+++ /dev/null
@@ -1,102 +0,0 @@
-FROM debian:bullseye-slim
-
-LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
-      org.opencontainers.image.description="Official Docker image for ioBroker smarthome software (https://www.iobroker.net)" \
-      org.opencontainers.image.documentation="https://github.com/buanet/ioBroker.docker#readme" \
-      org.opencontainers.image.authors="André Germann <info@buanet.de>" \
-      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="docker.io/library/debian:bullseye-slim" \
-      org.opencontainers.image.version="${VERSION}" \
-      org.opencontainers.image.created="${DATI}"
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Copy scripts
-COPY scripts /opt/scripts
-COPY userscripts /opt/userscripts
-
-# Install prerequisites (including node) and generating locales
-RUN apt-get update && apt-get install -y \
-    apt-utils \
-    cifs-utils \
-    curl \
-    gosu \
-    iputils-ping \
-    jq \
-    locales \
-    nfs-common \
-    procps \
-    python3 \
-    python3-dev \
-    sudo \
-    tar \
-    tzdata \
-    udev \
-    wget \
-    # Install node
-    && curl -sL https://deb.nodesource.com/setup_20.x | bash \
-    && apt-get update && apt-get install -y nodejs \
-    # Install node-gyp
-    && npm install -g node-gyp \
-    # Generating locales
-    && sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
-    && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
-    && locale-gen \
-    # Change permissions for scripts
-    && chmod 777 /opt/scripts/ \
-    && chmod 777 /opt/userscripts/ \
-    && chmod +x /opt/scripts/*.sh \
-    && chmod +x /opt/userscripts/*.sh \
-    # Prepare
-    && mkdir -p /opt/scripts/.docker_config/ \
-    && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
-    && echo "${VERSION}" > /opt/scripts/.docker_config/.thisisdocker \
-    && echo "true" > /opt/.first_run \
-    # Run installer
-    && curl -sL https://iobroker.net/install.sh | bash - \
-    # Deleting UUID from build
-    && iobroker unsetup -y \
-    && echo "true" > /opt/iobroker/.fresh_install \
-    # Backup initial ioBroker and userscript folder
-    && tar -cf /opt/initial_iobroker.tar /opt/iobroker \
-    && tar -cf /opt/initial_userscripts.tar /opt/userscripts \
-    # Setting up iobroker-user (shell, home dir and rights)
-    && chsh -s /bin/bash iobroker \
-    && usermod --home /opt/iobroker iobroker \
-    && usermod -u 1000 iobroker \
-    && groupmod -g 1000 iobroker \
-    && chown root:iobroker /usr/sbin/gosu \
-    && chmod +s /usr/sbin/gosu \
-    # Clean up installation cache
-    && apt-get autoclean -y \
-    && apt-get autoremove \
-    && apt-get clean \
-    && rm -rf /tmp/* /var/tmp/* \
-    && rm -rf /root/.cache/* /root/.npm/* \
-    && rm -rf /var/lib/apt/lists/*
-
-# Setting up default ENVs
-ENV DEBIAN_FRONTEND="teletype" \
-    LANG="de_DE.UTF-8" \
-    LANGUAGE="de_DE:de" \
-    LC_ALL="de_DE.UTF-8" \
-    SETGID=1000 \
-    SETUID=1000 \
-    TZ="Europe/Berlin"
-
-# Expose default admin ui port
-EXPOSE 8081
-
-# Change work dir
-WORKDIR /opt/iobroker/
-
-# Healthcheck
-HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
-    CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
-
-# Volumes for persistent data
-VOLUME ["/opt/iobroker"]
-
-# Run startup-script
-ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/debian/node16/Dockerfile b/debian11/node16/Dockerfile
similarity index 100%
rename from debian/node16/Dockerfile
rename to debian11/node16/Dockerfile
diff --git a/debian/node18/Dockerfile b/debian11/node18/Dockerfile
similarity index 100%
rename from debian/node18/Dockerfile
rename to debian11/node18/Dockerfile
diff --git a/debian/scripts/healthcheck.sh b/debian11/scripts/healthcheck.sh
similarity index 100%
rename from debian/scripts/healthcheck.sh
rename to debian11/scripts/healthcheck.sh
diff --git a/debian/scripts/iobroker_startup.sh b/debian11/scripts/iobroker_startup.sh
similarity index 100%
rename from debian/scripts/iobroker_startup.sh
rename to debian11/scripts/iobroker_startup.sh
diff --git a/debian/scripts/maintenance.sh b/debian11/scripts/maintenance.sh
similarity index 100%
rename from debian/scripts/maintenance.sh
rename to debian11/scripts/maintenance.sh
diff --git a/debian/scripts/setup_avahi.sh b/debian11/scripts/setup_avahi.sh
similarity index 100%
rename from debian/scripts/setup_avahi.sh
rename to debian11/scripts/setup_avahi.sh
diff --git a/debian/scripts/setup_iob_db.sh b/debian11/scripts/setup_iob_db.sh
similarity index 100%
rename from debian/scripts/setup_iob_db.sh
rename to debian11/scripts/setup_iob_db.sh
diff --git a/debian/scripts/setup_packages.sh b/debian11/scripts/setup_packages.sh
similarity index 100%
rename from debian/scripts/setup_packages.sh
rename to debian11/scripts/setup_packages.sh
diff --git a/debian/scripts/setup_zwave.sh b/debian11/scripts/setup_zwave.sh
similarity index 100%
rename from debian/scripts/setup_zwave.sh
rename to debian11/scripts/setup_zwave.sh
diff --git a/debian/userscripts/userscript_everystart_example.sh b/debian11/userscripts/userscript_everystart_example.sh
similarity index 100%
rename from debian/userscripts/userscript_everystart_example.sh
rename to debian11/userscripts/userscript_everystart_example.sh
diff --git a/debian/userscripts/userscript_firststart_example.sh b/debian11/userscripts/userscript_firststart_example.sh
similarity index 100%
rename from debian/userscripts/userscript_firststart_example.sh
rename to debian11/userscripts/userscript_firststart_example.sh
diff --git a/debian12/test_stack.yml b/debian12/test_stack.yml
deleted file mode 100644
index 6b6def0..0000000
--- a/debian12/test_stack.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: "3"
-services:
-  ##### IOBROKER #####
-  iobrokertest:
-    container_name: iobrokertest
-    image: buanet/iobroker:testing
-    hostname: iobrokertest
-    restart: always
-    ports:
-      - 8081:8081
-    environment:
-      - PACKAGES=nano
-      - DEBUG=true
-    volumes:
-      - /home/andre/tmp/docker/iobrokertest_data:/opt/iobroker
\ No newline at end of file