diff --git a/.VERSION b/.VERSION
index 27157ca..2bd9dba 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v8.1.0-beta.2
\ No newline at end of file
+v8.1.0
\ No newline at end of file
diff --git a/.github/workflows/build-debian-image-beta-node20.yml b/.github/workflows/build-debian-image-beta-node20.yml
index 6e74cc4..ede0388 100644
--- a/.github/workflows/build-debian-image-beta-node20.yml
+++ b/.github/workflows/build-debian-image-beta-node20.yml
@@ -14,7 +14,7 @@ jobs:
         run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
     
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}
@@ -43,7 +43,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.9.0
+        uses: docker/setup-buildx-action@v2.9.1
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.2.0
diff --git a/.github/workflows/build-debian-image-beta.yml b/.github/workflows/build-debian-image-beta.yml
index c78e7e2..5db6121 100644
--- a/.github/workflows/build-debian-image-beta.yml
+++ b/.github/workflows/build-debian-image-beta.yml
@@ -14,7 +14,7 @@ jobs:
         run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
     
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}
@@ -43,7 +43,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.9.0
+        uses: docker/setup-buildx-action@v2.9.1
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.2.0
diff --git a/.github/workflows/build-debian-image-dev-node20.yml b/.github/workflows/build-debian-image-dev-node20.yml
index 3ebb73c..6baccb2 100644
--- a/.github/workflows/build-debian-image-dev-node20.yml
+++ b/.github/workflows/build-debian-image-dev-node20.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
 
@@ -37,7 +37,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.9.0
+        uses: docker/setup-buildx-action@v2.9.1
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.2.0
diff --git a/.github/workflows/build-debian-image-dev.yml b/.github/workflows/build-debian-image-dev.yml
index 74c5331..209d63a 100644
--- a/.github/workflows/build-debian-image-dev.yml
+++ b/.github/workflows/build-debian-image-dev.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
 
@@ -37,7 +37,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.9.0
+        uses: docker/setup-buildx-action@v2.9.1
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.2.0
diff --git a/.github/workflows/build-debian-image-latest-iob.yml b/.github/workflows/build-debian-image-latest-iob.yml
index 816953b..6f07a7f 100644
--- a/.github/workflows/build-debian-image-latest-iob.yml
+++ b/.github/workflows/build-debian-image-latest-iob.yml
@@ -17,7 +17,7 @@ jobs:
           echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
     
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}
@@ -46,7 +46,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.9.0
+        uses: docker/setup-buildx-action@v2.9.1
 
       - name: Login to DockerHub (iobroker)
         uses: docker/login-action@v2.2.0
diff --git a/.github/workflows/build-debian-image-latest.yml b/.github/workflows/build-debian-image-latest.yml
index bfb8cb1..c677a89 100644
--- a/.github/workflows/build-debian-image-latest.yml
+++ b/.github/workflows/build-debian-image-latest.yml
@@ -17,7 +17,7 @@ jobs:
           echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
 
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}
@@ -46,7 +46,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.9.0
+        uses: docker/setup-buildx-action@v2.9.1
       - name: Login to DockerHub (buanet)
         uses: docker/login-action@v2.2.0
         with:
diff --git a/.github/workflows/check-iobroker-versions.yml b/.github/workflows/check-iobroker-versions.yml
index 1f81bc0..e6c287d 100644
--- a/.github/workflows/check-iobroker-versions.yml
+++ b/.github/workflows/check-iobroker-versions.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
           token: ${{ secrets.ACTIONS_PAT }}
diff --git a/.github/workflows/update-docker-readme.yml b/.github/workflows/update-docker-readme.yml
index 0b7c038..ecd8ffc 100644
--- a/.github/workflows/update-docker-readme.yml
+++ b/.github/workflows/update-docker-readme.yml
@@ -12,10 +12,10 @@ jobs:
   update-docker-readme:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v3.5.3
 
     - name: Update Docker Hub Readme (buanet)
-      uses: peter-evans/dockerhub-description@v3
+      uses: peter-evans/dockerhub-description@v3.4.2
       with:
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_PASS }}
@@ -24,7 +24,7 @@ jobs:
         readme-filepath: ./docs/README_docker_hub_buanet.md
 
     - name: Update Docker Hub Readme (iobroker)
-      uses: peter-evans/dockerhub-description@v3
+      uses: peter-evans/dockerhub-description@v3.4.2
       with:
         username: ${{ secrets.DOCKER_USER_IOB }}
         password: ${{ secrets.DOCKER_PASS_IOB }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3d9de5..87536c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,20 @@
 ## Changelog
 
-### v8.1.0-beta.2 (coming soon)
-* prohibit restore when startup script is still running
-* extend time before restart after restore is done
-* influx data repo will be added automatically when PACKAGES contains influxdb or influxdb2-cli package
+### v8.1.0 (15.08.2023)
+* repo cleanup
+* v8.1.0-beta.4 (29.07.2023)
+  * fix container restart in maintenance script 
+  * fix running maintenance script as iobroker
+  * enhance quoting ([#357 by @dontobi](https://github.com/buanet/ioBroker.docker/pull/357))
+* v8.1.0-beta.3 (05.07.2023)
+  * fix permission issue for restart container as iobroker user
+  * fix issue with js-controller ui upgrade
+  * fix small issues in maintenance script
+  * update action workflows
+* v8.1.0-beta.2 (26.04.2023)
+  * prohibit restore when startup script is still running
+  * extend time before restart after restore is done
+  * influx data repo will be added automatically when PACKAGES contains influxdb or influxdb2-cli package
 * v8.1.0-beta.1 (14.04.2023)
   * enhance github actions
   * enhance log output of maintenance script on restore ([#333](https://github.com/buanet/ioBroker.docker/issues/333))
@@ -276,4 +287,4 @@
 * added support for avahi-daemon (installation and autostart)
 
 ### v0.0.1 (2017-01-31)
-* project started / initial release
+* project started / initial release
\ No newline at end of file
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/scripts/healthcheck.sh b/debian/scripts/healthcheck.sh
index 072f9c0..d55d1f4 100644
--- a/debian/scripts/healthcheck.sh
+++ b/debian/scripts/healthcheck.sh
@@ -4,17 +4,17 @@
 
 if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
 then
-  echo 'Health status: OK - Startup script is still running.'
+  echo "Health status: OK - Startup script is still running."
   exit 0
 elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
 then
-  echo 'Health status: OK - Container is running in maintenance mode.'
+  echo "Health status: OK - Container is running in maintenance mode."
   exit 0
 elif [ "$(ps -fe|grep "[i]obroker.js-controller"|awk '{print $2}')" != "" ]
 then
-  echo 'Health status: OK - Main process (js-controller) is running.'
+  echo "Health status: OK - Main process (js-controller) is running."
   exit 0
 fi
 
-echo 'Health status: !!! NOT OK !!! - Something went wrong. Please see container logs for more details and/or try restarting the container.'
+echo "Health status: !!! NOT OK !!! - Something went wrong. Please see container logs for more details and/or try restarting the container."
 exit 1
diff --git a/debian/scripts/iobroker_startup.sh b/debian/scripts/iobroker_startup.sh
index 2005c62..3131964 100644
--- a/debian/scripts/iobroker_startup.sh
+++ b/debian/scripts/iobroker_startup.sh
@@ -4,7 +4,7 @@
 set -euo pipefail
 
 # Setting healthcheck status to "starting"
-echo 'starting' > /opt/scripts/.docker_config/.healthcheck
+echo "starting" > /opt/scripts/.docker_config/.healthcheck
 
 # Reading ENV
 set +u
@@ -37,14 +37,14 @@ pkill_timeout=10      # timeout for iobroker shutdown in seconds
 # Stop on error function
 stop_on_error() {
   if [[ "$debug" == "true" ]]; then 
-    echo ' '
+    echo " "
     echo "[DEBUG] Debug mode prevents the container from exiting on errors."
     echo "[DEBUG] This enables you to investigate or fix your issue on the command line."
     echo "[DEBUG] If you want to stop or restart your container you have to do it manually."
     echo "[DEBUG] IoBroker is not running!"
       tail -f /dev/null
   else
-    echo ' '
+    echo " "
     echo "This Script will exit now."
       exit 1
   fi
@@ -54,7 +54,7 @@ stop_on_error() {
 dati=$(date '+%Y-%m-%d %H:%M:%S')
 
 # Logging header
-echo ' '
+echo " "
 echo "$(printf -- '-%.0s' {1..80})"
 echo -n "$(printf -- '-%.0s' {1..25})" && echo -n "     ""$dati""      " && echo "$(printf -- '-%.0s' {1..25})"
 echo "$(printf -- '-%.0s' {1..80})"
@@ -70,7 +70,7 @@ echo "-----              Welcome to your ioBroker Docker container!
 echo "-----                    Startupscript is now running!                     -----"
 echo "-----                          Please be patient!                          -----"
 echo "$(printf -- '-%.0s' {1..80})"
-echo ' '
+echo " "
 echo "$(printf -- '-%.0s' {1..80})"
 echo "-----                          System Information                          -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" arch: "$(uname -m)")" && echo " -----"
@@ -106,7 +106,7 @@ if [[ "$setuid" != "" ]]; then echo -n "-----                    " && echo -n "$
 if [[ "$usbdevices" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" USBDEVICES: "$usbdevices")" && echo " -----"; fi
 if [[ "$zwave" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" ZWAVE: "$zwave")" && echo " -----"; fi
 echo "$(printf -- '-%.0s' {1..80})"
-echo ' '
+echo " "
 
 # Debug logging notice
 if [[ "$debug" == "true" ]]; then
@@ -118,7 +118,7 @@ if [[ "$debug" == "true" ]]; then
   echo "!!!!     For more information see ioBroker Docker image documentation:      !!!!"
   echo "!!!!           https://docs.buanet.de/iobroker-docker-image/docs/           !!!!"
   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  echo ' '
+  echo " "
 fi
 
 #####
@@ -127,7 +127,7 @@ fi
 echo "$(printf -- '-%.0s' {1..80})"
 echo "-----                   Step 1 of 5: Preparing container                   -----"
 echo "$(printf -- '-%.0s' {1..80})"
-echo ' '
+echo " "
 
 # Actions running on first start only
 if [[ -f /opt/.first_run ]]; then
@@ -137,26 +137,25 @@ if [[ -f /opt/.first_run ]]; then
   else
     bash /opt/scripts/setup_packages.sh -update
   fi
-  echo ' '
+  echo " "
   # Installing packages from ENV
   if [[ "$packages" != "" && "$offlinemode" = "true" ]]; then
     echo "PACKAGES is set, but OFFLINE_MODE is \"true\". Skipping Linux package installation."
   elif [[ "$packages" != "" ]]; then
     echo "PACKAGES is set. Installing the following additional Linux packages: ""$packages"
-#    echo "$packages" > /opt/scripts/.docker_config/.packages
       bash /opt/scripts/setup_packages.sh -install
   fi
-  echo ' '
+  echo " "
   # Register maintenance script
-  echo -n 'Registering maintenance script as command... '
-  echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
-  echo "alias maint=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
-  echo "alias m=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
-  echo 'Done.'
+  echo -n "Registering maintenance script as command... "
+  echo "alias maintenance='/opt/scripts/maintenance.sh'" >> /etc/bash.bashrc
+  echo "alias maint='/opt/scripts/maintenance.sh'" >> /etc/bash.bashrc
+  echo "alias m='/opt/scripts/maintenance.sh'" >> /etc/bash.bashrc
+  echo "Done."
 else
   echo "This is not the first run of this container. Skipping first run preparation."
 fi
-echo ' '
+echo " "
 
 # Setting UID and/ or GID
 if [[ "$setgid" != "$(cat /etc/group | grep 'iobroker:' | cut -d':' -f3)" || "$setuid" != "$(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3)" ]]; then
@@ -164,8 +163,8 @@ if [[ "$setgid" != "$(cat /etc/group | grep 'iobroker:' | cut -d':' -f3)" || "$s
   echo -n "Changing UID to \"""$setuid""\" and GID to \"""$setgid""\"... "
     usermod -u "$setuid" iobroker
     groupmod -og "$setgid" iobroker
-  echo 'Done.'
-  echo ' '
+  echo "Done."
+  echo " "
 fi
 
 # Change directory for next steps
@@ -177,13 +176,13 @@ cd /opt/iobroker
 echo "$(printf -- '-%.0s' {1..80})"
 echo "-----             Step 2 of 5: Detecting ioBroker installation             -----"
 echo "$(printf -- '-%.0s' {1..80})"
-echo ' '
+echo " "
 
 if [[ `find /opt/iobroker -type f | wc -l` -lt 1 ]]; then
   echo "There is no data detected in /opt/iobroker."
   echo -n "Restoring initial ioBroker installation... "
     tar -xf /opt/initial_iobroker.tar -C /
-  echo 'Done.'
+  echo "Done."
 elif [[ -f /opt/iobroker/iobroker ]]; then
   echo "Existing installation of ioBroker detected in \"/opt/iobroker\"."
 elif [[ "$(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l)" != "0" && "$(tar -ztvf /opt/iobroker/*_backupiobroker.tar.gz "backup/backup.json" 2> /dev/null | wc -l)" != "0" ]]; then
@@ -193,7 +192,7 @@ elif [[ "$(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l)" != "0" && "$(tar -z
   echo "IoBroker will start with a fresh installation, while your backup file will be copied into the backup directory."
   echo "You will be able to restore your backup file manually by using the backitup adapter or the containers maintenance script."
   echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
-  echo ' '
+  echo " "
   echo -n "Copying backup file and restoring initial ioBroker installation... "
     mv /opt/iobroker/*.tar.gz /opt/
     tar -xf /opt/initial_iobroker.tar -C /
@@ -201,7 +200,7 @@ elif [[ "$(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l)" != "0" && "$(tar -z
     mv /opt/*.tar.gz /opt/iobroker/backups/
     # fixing permission errors during restore
     chown -R "$setuid":"$setgid" /opt/iobroker
-  echo 'Done.'
+  echo "Done."
 else
   echo "There is data detected in /opt/iobroker but it looks like it is no instance of ioBroker!"
   if [[ "$debug" == "true" ]]; then
@@ -211,7 +210,7 @@ else
   echo "Please check/ recreate mounted folder or volume and try again."
   stop_on_error
 fi
-echo ' '
+echo " "
 
 #####
 # STEP 3 - Checking ioBroker-Installation
@@ -219,7 +218,7 @@ echo ' '
 echo "$(printf -- '-%.0s' {1..80})"
 echo "-----             Step 3 of 5: Checking ioBroker installation              -----"
 echo "$(printf -- '-%.0s' {1..80})"
-echo ' '
+echo " "
 
 # (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"
 if [[ "$permissioncheck" == "false" ]]; then
@@ -228,17 +227,17 @@ else
   echo -n "(Re)setting permissions (This might take a while! Please be patient!)... "
     chown -R "$setuid":"$setgid" /opt/iobroker
     chown -R "$setuid":"$setgid" /opt/scripts
-  echo 'Done.'
+  echo "Done."
 fi
-echo ' '
+echo " "
 
 # Backing up original iobroker-file and changing sudo to gosu
 echo -n "Fixing \"sudo-bug\" by replacing sudo with gosu... "
   cp -a /opt/iobroker/iobroker /opt/iobroker/iobroker.bak
   chmod 755 /opt/iobroker/iobroker
   sed -i 's/sudo -H -u/gosu/g' /opt/iobroker/iobroker
-echo 'Done.'
-echo ' '
+echo "Done."
+echo " "
 
 # Checking multihost and db setup
 if [[ "$multihost" == "master" || "$multihost" == "slave" ]]; then
@@ -262,7 +261,7 @@ elif [[ "$multihost" == "" || "$multihost" == "false" ]]; then
     echo "[DEBUG] Checking multihost settings... "
     echo "[DEBUG] No multihost settings detected."
     echo "[DEBUG] Done."
-    echo ' '
+    echo " "
   fi
   # checking custom objects db settings
   if [[ "$objectsdbtype" != "" || "$objectsdbhost" != "" || "$objectsdbport" != "" ]]; then
@@ -277,7 +276,7 @@ elif [[ "$multihost" == "" || "$multihost" == "false" ]]; then
       echo "[DEBUG] Checking custom objects db settings... "
       echo "[DEBUG] No custom objects db settings detected."
       echo "[DEBUG] Done."
-      echo ' '
+      echo " "
     fi 
   fi
   # checking custom states db settings
@@ -293,7 +292,7 @@ elif [[ "$multihost" == "" || "$multihost" == "false" ]]; then
       echo "[DEBUG] Checking custom states db settings... "
       echo "[DEBUG] No custom states db settings detected."
       echo "[DEBUG] Done."
-      echo ' '
+      echo " "
     fi 
   fi
 else
@@ -317,14 +316,14 @@ if [[ -f /opt/iobroker/.fresh_install && "$multihost" != "slave" ]]; then
     echo "Please check your configuration and try again."
     stop_on_error
   fi
-  echo 'Done.'
-  echo ' '
+  echo "Done."
+  echo " "
 else
   echo -n "Checking Database connection... "
   set +e
   if iob uuid &> /dev/null; then
-    echo 'Done.'
-    echo ' '
+    echo "Done."
+    echo " "
   else
     errormsg=$(iob uuid 2>&1 | sed 's/^/[DEBUG] /')
     echo "Failed."
@@ -342,7 +341,7 @@ fi
 # hostname check
 if [[ "$multihost" == "slave" ]]; then
   echo "IOB_MULTIHOST is set to \"slave\". Hostname check will be skipped."
-  echo ' '
+  echo " "
 else
   # get admin instance and hostname
   set +e
@@ -373,12 +372,12 @@ else
     echo "Hostname in ioBroker does not match the hostname of this container."
     echo -n "Updating hostname to \"""$(hostname)""\"... "
       bash iobroker host "$adminhostname"
-    echo 'Done.'
-    echo ' '
+    echo "Done."
+    echo " "
   elif [[ "$adminhostname" = "$(hostname)" ]]; then
     echo "Hostname in ioBroker matches the hostname of this container."
     echo "No action required."
-    echo ' '
+    echo " "
   else
     echo "There was a problem checking the hostname."
     stop_on_error
@@ -388,7 +387,7 @@ fi
 # extended debug output
 if [[ "$debug" == "true" && "$multihost" != "slave" ]]; then
   echo "[DEBUG] Collecting some more ioBroker debug information... "
-  echo ' '
+  echo " "
   # get information and send to array
   IFS=$'\n'
   instances_array=("$(iob list instances)")
@@ -400,19 +399,19 @@ if [[ "$debug" == "true" && "$multihost" != "slave" ]]; then
     do
       echo "$i"
     done
-  echo ' '
+  echo " "
   echo "[DEBUG] ##### iobroker repo list #####"
     for i in "${repos_array[@]}"
     do
       echo "$i"
     done
-  echo ' '
+  echo " "
   echo "[DEBUG] ##### iobroker update #####"
     for i in "${updates_array[@]}"
     do
       echo "$i"
     done
-  echo ' '
+  echo " "
   unset IFS
 fi
 
@@ -422,11 +421,11 @@ fi
 echo "$(printf -- '-%.0s' {1..80})"
 echo "-----                Step 4 of 5: Applying special settings                -----"
 echo "$(printf -- '-%.0s' {1..80})"
-echo ' '
+echo " "
 
 echo "Some adapters have special requirements/ settings which can be activated by the use of environment variables."
 echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
-echo ' '
+echo " "
 
 # Checking ENV for Adminport
 if [[ "$adminport" != "" && "$multihost" != "slave" ]]; then
@@ -437,17 +436,17 @@ if [[ "$adminport" != "" && "$multihost" != "slave" ]]; then
     if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected Admin Port in ioBroker: " "$adminportold"; fi
     echo "Setting Adminport to \"""$adminport""\"... "
       bash iobroker set "$admininstanceshort" --port "$adminport"
-    echo 'Done.'
-    echo ' '
+    echo "Done."
+    echo " "
   fi
 fi
 
 # Checking ENV for Backitup (external database backups)
 if [[ "$backitup" == "true" ]]; then
-  echo -n "IOB_BACKITUP_EXTDB is \"true\". Unlocking features... "
-  echo 'true' > /opt/scripts/.docker_config/.backitup
-  echo 'Done.'
-  echo ' '
+  echo -n "IOB_BACKITUP_EXTDB is \"true\". Unlocking features..."
+  echo "true" > /opt/scripts/.docker_config/.backitup
+  echo "Done."
+  echo " "
 fi
 
 # Checking ENV for AVAHI
@@ -457,8 +456,8 @@ elif [[ "$avahi" = "true" ]]; then
   echo "AVAHI is \"true\". Running setup script... "
     chmod 755 /opt/scripts/setup_avahi.sh
     bash /opt/scripts/setup_avahi.sh
-  echo 'Done.'
-  echo ' '
+  echo "Done."
+  echo " "
 fi
 
 # Checking ENV for Z-WAVE
@@ -468,8 +467,8 @@ elif [[ "$zwave" = "true" ]]; then
   echo "ZWAVE is \"true\". Running setup script... "
     chmod 755 /opt/scripts/setup_zwave.sh
     bash /opt/scripts/setup_zwave.sh
-  echo 'Done.'    
-  echo ' '
+  echo "Done."    
+  echo " "
 fi
 
 # checking ENV for USBDEVICES
@@ -482,7 +481,7 @@ if [[ "$usbdevices" != "" && "$usbdevices" != "none" ]]; then
         echo -n "Setting permissions for \"""$i""\"... "
         chown root:dialout "$i"
         chmod g+rw "$i"
-        echo 'Done.'
+        echo "Done."
         if [[ "$debug" == "true" ]]; then echo "[DEBUG] Permissions set: " "$(ls -al "$i")"; fi
       else
         echo "Looks like the device \"""$i""\" does not exist."
@@ -491,7 +490,7 @@ if [[ "$usbdevices" != "" && "$usbdevices" != "none" ]]; then
         stop_on_error
       fi
     done
-  echo ' '
+  echo " "
 fi
 
 # Checking for Userscripts in /opt/userscripts
@@ -500,23 +499,23 @@ if [[ $(find /opt/userscripts -type f | wc -l) -lt 1 ]]; then
     tar -xf /opt/initial_userscripts.tar -C /
     chmod 755 /opt/userscripts/userscript_firststart_example.sh
     chmod 755 /opt/userscripts/userscript_everystart_example.sh
-  echo 'Done.'
+  echo "Done."
 elif [[ -f /opt/userscripts/userscript_firststart.sh || -f /opt/userscripts/userscript_everystart.sh ]]; then
   if [[ -f /opt/userscripts/userscript_firststart.sh && -f /opt/.first_run ]]; then
     echo "Userscript for first start detected and this is the first start of a new container."
     echo "Running userscript_firststart.sh... "
       chmod 755 /opt/userscripts/userscript_firststart.sh
       bash /opt/userscripts/userscript_firststart.sh
-    echo 'Done.'
+    echo "Done."
   fi
   if [[ -f /opt/userscripts/userscript_everystart.sh ]]; then
     echo "Userscript for every start detected. Running userscript_everystart.sh... "
       chmod 755 /opt/userscripts/userscript_everystart.sh
       bash /opt/userscripts/userscript_everystart.sh
-    echo 'Done.'
+    echo "Done."
   fi
 fi
-echo ' '
+echo " "
 
 # Removing first run an fresh install markers when exists
 if [[ -f /opt/.first_run ]]; then rm -f /opt/.first_run; fi
@@ -528,9 +527,9 @@ if [[ -f /opt/iobroker/.fresh_install ]]; then rm -f /opt/iobroker/.fresh_instal
 echo "$(printf -- '-%.0s' {1..80})"
 echo "-----                    Step 5 of 5: ioBroker startup                     -----"
 echo "$(printf -- '-%.0s' {1..80})"
-echo ' '
+echo " "
 echo "Starting ioBroker... "
-echo ' '
+echo " "
 echo "##### #### ### ## # iobroker.js-controller log output # ## ### #### #####"
 
 # Setting healthcheck status to "running"
@@ -538,7 +537,7 @@ echo "running" > /opt/scripts/.docker_config/.healthcheck
 
 # Function for graceful shutdown by SIGTERM signal
 shut_down() {
-  echo ' '
+  echo " "
   echo "Recived termination signal (SIGTERM)."
   echo "Shutting down ioBroker... "
 
@@ -558,13 +557,13 @@ shut_down() {
   # pgrep exits with status 1 when there are no matches
   while pgrep -u iobroker > /dev/null; (( $? != 1 )); do
     if (($(date +%s) > timeout)); then
-      echo -e '\nTimeout reached. Killing remaining processes... '
+      echo -e "\nTimeout reached. Killing remaining processes... "
       pkill --signal SIGKILL -u iobroker
-      echo 'Done. Have a nice day!'
+      echo "Done. Have a nice day!"
       exit
     fi
 
-    echo -n '.'
+    echo -n "."
     sleep 1
   done
 
diff --git a/debian/scripts/maintenance.sh b/debian/scripts/maintenance.sh
index dc423bc..c0ab532 100644
--- a/debian/scripts/maintenance.sh
+++ b/debian/scripts/maintenance.sh
@@ -10,27 +10,27 @@ pkill_timeout=10      # timeout for stopping iobroker in seconds
 
 # display help text
 display_help() {
-  echo 'This script helps you manage your ioBroker container!'
-  echo ''
+  echo "This script helps you manage your ioBroker container!"
+  echo " "
   echo "Usage: maintenance [ COMMAND ] [ OPTION ]"
   echo "       maint [ COMMAND ] [ OPTION ]"
   echo "       m [ COMMAND ] [ OPTION ]"
-  echo ''
-  echo 'COMMANDS'
-  echo '------------------'
-  echo '       status     > reports the current state of maintenance mode'
-  echo '       on         > switches mantenance mode ON'
-  echo '       off        > switches mantenance mode OFF and stops or restarts the container'
-  echo '       upgrade    > puts the container to maintenance mode and upgrades ioBroker'
-  echo '       restart    > stops iobroker and stops or restarts the container'
-  echo '       restore    > stops iobroker and restores the last backup'
-  echo '       help       > shows this help'
-  echo ''
-  echo 'OPTIONS'
-  echo '------------------'
-  echo '       -y|--yes   > confirms the used command without asking'
-  echo '       -h|--help  > shows this help'
-  echo ''
+  echo " "
+  echo "COMMANDS"
+  echo "------------------"
+  echo "       status     > reports the current state of maintenance mode"
+  echo "       on         > switches mantenance mode ON"
+  echo "       off        > switches mantenance mode OFF and stops or restarts the container"
+  echo "       upgrade    > puts the container to maintenance mode and upgrades ioBroker"
+  echo "       restart    > stops iobroker and stops or restarts the container"
+  echo "       restore    > stops iobroker and restores the last backup"
+  echo "       help       > shows this help"
+  echo " "
+  echo "OPTIONS"
+  echo "------------------"
+  echo "       -y|--yes   > confirms the used command without asking"
+  echo "       -h|--help  > shows this help"
+  echo " "
 }
 
 # check maintenance enabled
@@ -46,66 +46,50 @@ check_starting() {
 # display maintenance status
 maintenance_status() {
   if maintenance_enabled; then
-    echo 'Maintenance mode is turned ON.'
+    echo "Maintenance mode is turned ON."
   else
-    echo 'Maintenance mode is turned OFF.'
+    echo "Maintenance mode is turned OFF."
   fi
 }
 
 # enable maintenance mode
 enable_maintenance() {
   if maintenance_enabled; then
-    echo 'Maintenance mode is already turned ON.'
+    echo "Maintenance mode is already turned ON."
     return
   fi
 
-  if [[ "$killbyname" == yes ]]; then
-    # undocumented option, only for use with backitup restore scripts
-    # stops iobroker by terminating js-controller process by name (the old way)
-    echo 'This command will activate maintenance mode and stop js-controller.'
-    echo 'Activating maintenance mode...'
-    echo 'maintenance' > "$healthcheck"
-    sleep 1
-    echo 'Done.'
-    echo -n 'Stopping ioBroker...'
-    pkill -u iobroker -f iobroker.js-controller
-    sleep 5
-    echo 'Done.'
-    return
-  fi
+  echo "You are now going to stop ioBroker and activate maintenance mode for this container."
 
-  echo 'You are now going to stop ioBroker and activate maintenance mode for this container.'
+  if [[ "$killbyname" != yes ]]; then
+    if [[ "$autoconfirm" != yes ]]; then
+      local reply
 
-  if [[ "$autoconfirm" != yes ]]; then
-    local reply
-
-    read -rp 'Do you want to continue [yes/no]? ' reply
-    if [[ "$reply" == y || "$reply" == Y || "$reply" == yes ]]; then
+      read -rp 'Do you want to continue [yes/no]? ' reply
+      if [[ "$reply" == y || "$reply" == Y || "$reply" == yes ]]; then
       : # continue
-    else
-      return 1
+      else
+        return 1
+      fi
     fi
-  else
-    echo 'This command was already confirmed by the -y or --yes option.'
   fi
 
-  echo 'Activating maintenance mode...'
-  echo 'maintenance' > "$healthcheck"
+  echo "Activating maintenance mode..."
+  echo "maintenance" > "$healthcheck"
   sleep 1
-  echo 'Done.'
-  echo -n 'Stopping ioBroker...'
+  echo -n "Stopping ioBroker..."
   stop_iob
 }
 
 # disable maintenance mode
 disable_maintenance() {
   if ! maintenance_enabled; then
-    echo 'Maintenance mode is already turned OFF.'
+    echo "Maintenance mode is already turned OFF."
     return
   fi
 
-  echo 'You are now going to deactivate maintenance mode for this container.'
-  echo 'Depending on the restart policy, your container will be stopped or restarted immediately.'
+  echo "You are now going to deactivate maintenance mode for this container."
+  echo "Depending on the restart policy, your container will be stopped or restarted immediately."
 
   if [[ "$autoconfirm" != yes ]]; then
     local reply
@@ -116,22 +100,20 @@ disable_maintenance() {
     else
       return 1
     fi
-  else
-    echo 'This command was already confirmed by the -y or --yes option.'
   fi
 
-  echo 'Deactivating maintenance mode and forcing container to stop or restart...'
-  echo 'stopping' > "$healthcheck"
-  pkill -u root
-  echo 'Done.'
+  echo "Deactivating maintenance mode and forcing container to stop or restart..."
+  echo "stopping" > "$healthcheck"
+  gosu root pkill -u root
+  echo "Done."
 }
 
 # upgrade js-controller
 upgrade_jscontroller() {
-  echo 'You are now going to upgrade your js-controller.'
-  echo 'As this will change data in /opt/iobroker, make sure you have a backup!'
-  echo 'During the upgrade process, the container will automatically switch into maintenance mode and stop ioBroker.'
-  echo 'Depending on the restart policy, your container will be stopped or restarted automatically after the upgrade.'
+  echo "You are now going to upgrade your js-controller."
+  echo "As this will change data in /opt/iobroker, make sure you have a backup!"
+  echo "During the upgrade process, the container will automatically switch into maintenance mode and stop ioBroker."
+  echo "Depending on the restart policy, your container will be stopped or restarted automatically after the upgrade."
 
   if [[ "$autoconfirm" != yes ]]; then
     local reply
@@ -142,8 +124,6 @@ upgrade_jscontroller() {
     else
       return 1
     fi
-  else
-    echo 'This command was already confirmed by the -y or --yes option.'
   fi
 
   if ! maintenance_enabled > /dev/null; then
@@ -151,17 +131,17 @@ upgrade_jscontroller() {
     enable_maintenance
   fi
 
-  echo 'Upgrading js-controller...'
+  echo "Upgrading js-controller..."
   iobroker update
   sleep 1
   iobroker upgrade self
   sleep 1
-  echo 'Done.'
+  echo "Done."
 
-  echo 'Container will be stopped or restarted in 5 seconds...'
+  echo "Container will be stopped or restarted in 5 seconds..."
   sleep 5
-  echo 'stopping' > "$healthcheck"
-  pkill -u root
+  echo "stopping" > "$healthcheck"
+  gosu root pkill -u root
 }
 
 # stop iobroker and wait until all processes stopped or pkill_timeout is reached
@@ -169,37 +149,41 @@ stop_iob() {
   local status timeout
 
   timeout="$(date --date="now + $pkill_timeout sec" +%s)"
-  pkill -u iobroker -f iobroker.js-controller
+  pkill -u iobroker -f 'iobroker.js-controller[^/]*$'
   status=$?
   if (( status >= 2 )); then      # syntax error or fatal error
     return 1
-  fi
-
-  if (( status == 1 )); then      # no processes matched
+  elif (( status == 1 )); then      # no processes matched
     return
   fi
 
-  # pgrep exits with status 1 when there are no matches
-  while pgrep -u iobroker > /dev/null; (( $? != 1 )); do
-    if (($(date +%s) > timeout)); then
-      echo -e '\nTimeout reached. Killing remaining processes...'
-      pgrep --list-full -u iobroker
-      pkill --signal SIGKILL -u iobroker
-      echo 'Done.'
-      return
-    fi
+  if [[ "$killbyname" != yes ]]; then
+    # pgrep exits with status 1 when there are no matches
+    while pgrep -u iobroker -f 'io.' > /dev/null; (( $? != 1 )); do
+      if (($(date +%s) > timeout)); then
+        echo -e "\nTimeout reached. Killing remaining processes..."
+        pgrep --list-full -u iobroker
+        pkill --signal SIGKILL -u iobroker -f 'io.'
+        echo "\nDone."
+        return
+      fi
+      sleep 1
+      echo -n "."
+    done
+  else
+    for ((i=0; i<3; i++)); do
+      sleep 1
+      echo -n "."
+    done
+  fi
 
-    echo -n '.'
-    sleep 1
-  done
-
-  echo -e '\nDone.'
+  echo -e "Done."
 }
 
 # restart container
 restart_container() {
-  echo 'You are now going to call a restart of your container.'
-  echo 'Restarting will work depending on the configured restart policy.'
+  echo "You are now going to call a restart of your container."
+  echo "Restarting will work depending on the configured restart policy."
 
   if [[ "$autoconfirm" != yes ]]; then
     local reply
@@ -210,24 +194,24 @@ restart_container() {
     else
       return 1
     fi
-  else
-    echo 'This command was already confirmed by the -y or --yes option.'
   fi
 
-  echo -n 'Stopping ioBroker...'
-  stop_iob
+  if ! maintenance_enabled > /dev/null; then
+    echo -n "Stopping ioBroker..."
+    stop_iob
+  fi
 
-  echo 'Container will be stopped or restarted in 5 seconds...'
+  echo "Container will be stopped or restarted in 5 seconds..."
   sleep 5
-  echo 'stopping' > "$healthcheck"
-  pkill -u root
+  echo "stopping" > "$healthcheck"
+  gosu root pkill -u root
 }
 
 # restore iobroker
 restore_iobroker() {
-  echo 'You are now going to perform a restore of your iobroker.'
-  echo 'During the restore process, the container will automatically switch into maintenance mode and stop ioBroker.'
-  echo 'Depending on the restart policy, your container will be stopped or restarted automatically after the restore.'
+  echo "You are now going to perform a restore of your iobroker."
+  echo "During the restore process, the container will automatically switch into maintenance mode and stop ioBroker."
+  echo "Depending on the restart policy, your container will be stopped or restarted automatically after the restore."
 
   if [[ "$autoconfirm" != yes ]]; then
     local reply
@@ -238,8 +222,6 @@ restore_iobroker() {
     else
       return 1
     fi
-  else
-    echo 'This command was already confirmed by the -y or --yes option.'
   fi
 
   if check_starting > /dev/null; then
@@ -265,8 +247,8 @@ restore_iobroker() {
     echo "Please check backup file location and permissions and try again." 
     return 1
   fi
-  echo 'Done.'
-  echo ' '
+  echo "Done."
+  echo " "
   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
   echo "!!!!                             IMPORTANT NOTE                             !!!!"
   echo "!!!!      The maintenance script restored iobroker from a backup file.      !!!!"
@@ -276,10 +258,10 @@ restore_iobroker() {
   echo "!!!!  You can view installation process by taking a look at ioBroker log.   !!!!"
   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
   sleep 10
-  echo 'Container will be stopped or restarted in 10 seconds...'
+  echo "Container will be stopped or restarted in 10 seconds..."
   sleep 10
-  echo 'stopping' > "$healthcheck"
-  pkill -u root
+  echo "stopping" > "$healthcheck"
+  gosu root pkill -u root
 }
 
 # parsing commands and options
@@ -321,7 +303,7 @@ for arg in "$@"; do
       ;;
     *)
       >&2 echo "Unknown parameter: $arg"
-      >&2 echo 'Please try again or see help (help|-h|--help).'
+      >&2 echo "Please try again or see help (help|-h|--help)."
       exit 1
       ;;
   esac
diff --git a/debian/scripts/setup_avahi.sh b/debian/scripts/setup_avahi.sh
index 6445516..46d5873 100644
--- a/debian/scripts/setup_avahi.sh
+++ b/debian/scripts/setup_avahi.sh
@@ -2,19 +2,19 @@
 
 if [ -e /usr/sbin/avahi-daemon ] && [ -e /var/run/dbus ]
 then
-  echo '[setup_avahi.sh] Avahi is already installed. Nothing to do here.'
+  echo "[setup_avahi.sh] Avahi is already installed. Nothing to do here."
 else
-  echo -n '[setup_avahi.sh] Avahi-daemon is NOT installed. Going to install it now... '
+  echo -n "[setup_avahi.sh] Avahi-daemon is NOT installed. Going to install it now... "
     apt-get update > /opt/scripts/avahi_startup.log 2>&1
-    apt-get install -y libavahi-compat-libdnssd-dev avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1
+    apt-get install -y --no-install-recommends libavahi-compat-libdnssd-dev avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1
     rm -rf /var/lib/apt/lists/* >> /opt/scripts/avahi_startup.log 2>&1
-  echo 'Done.'
-  echo -n '[setup_avahi.sh] Configuring avahi-daemon... '
+  echo "Done."
+  echo -n "[setup_avahi.sh] Configuring avahi-daemon... "
     sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf
-  echo 'Done.'
-  echo -n '[setup_avahi.sh] Configuring dbus... '
+  echo "Done."
+  echo -n "[setup_avahi.sh] Configuring dbus... "
     mkdir /var/run/dbus/
-  echo 'Done.'
+  echo "Done."
 fi
 
 if [ -f /var/run/dbus/pid ];
@@ -27,12 +27,12 @@ then
   rm -f /var/run/avahi-daemon//pid
 fi
 
-echo -n '[setup_avahi.sh] Starting dbus... '
+echo -n "[setup_avahi.sh] Starting dbus... "
   dbus-daemon --system >> /opt/scripts/avahi_startup.log 2>&1
-echo 'Done.'
+echo "Done."
 
-echo -n '[setup_avahi.sh] Starting avahi-daemon... '
+echo -n "[setup_avahi.sh] Starting avahi-daemon... "
   /etc/init.d/avahi-daemon start >> /opt/scripts/avahi_startup.log 2>&1
-echo 'Done.'
+echo "Done."
 
 exit 0
diff --git a/debian/scripts/setup_iob_db.sh b/debian/scripts/setup_iob_db.sh
index 44164b9..df1d679 100644
--- a/debian/scripts/setup_iob_db.sh
+++ b/debian/scripts/setup_iob_db.sh
@@ -26,7 +26,7 @@ set_objectsdb_type() {
     echo -n "Setting type of objects db to \"""$objectsdbtype""\"... "
       jq --arg value "$objectsdbtype" '.objects.type = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
       write_iobroker_json
-    echo 'Done.'
+    echo "Done."
   else
     echo "IOB_OBJECTSDB_TYPE is available and value meets detected ioBroker installation."
   fi
@@ -38,7 +38,7 @@ set_objectsdb_host() {
       echo -n "Setting host of objects db to \"""$objectsdbhost""\"... "
         jq --arg value "$objectsdbhost" '.objects.host = ($value|split(","))' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
         write_iobroker_json
-      echo 'Done.'
+      echo "Done."
     else
       echo "IOB_OBJECTSDB_HOST is available and value meets detected ioBroker installation."
     fi
@@ -48,7 +48,7 @@ set_objectsdb_host() {
         echo -n "Setting name of objects db to \"""$objectsdbname""\"... "
           jq --arg value "$objectsdbname" '.objects.sentinelName = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
           write_iobroker_json
-        echo 'Done.'
+        echo "Done."
       else
         echo "IOB_OBJECTSDB_NAME is available and value meets detected ioBroker installation."
       fi
@@ -58,7 +58,7 @@ set_objectsdb_host() {
         echo -n "Setting name of objects db to \"mymaster\"... "
           jq --arg value "mymaster" '.objects.sentinelName = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
           write_iobroker_json
-        echo 'Done.'
+        echo "Done."
       else
         echo "IOB_OBJECTSDB_NAME is not available but default value \"mymaster\" meets detected ioBroker installation.."
       fi
@@ -69,7 +69,7 @@ set_objectsdb_host() {
       echo -n "Setting host of objects db to \"""$objectsdbhost""\"... "
         jq --arg value "$objectsdbhost" '.objects.host = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
         write_iobroker_json
-      echo 'Done.'
+      echo "Done."
     else
       echo "IOB_OBJECTSDB_HOST is available and value meets detected ioBroker installation."
     fi
@@ -82,7 +82,7 @@ set_objectsdb_port() {
       echo -n "Setting port of objects db to \"""$objectsdbport""\"... "
         jq --arg value "$objectsdbport" '.objects.port = ($value|split(","))' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
         write_iobroker_json
-      echo 'Done.'
+      echo "Done."
     else
       echo "IOB_OBJECTSDB_PORT is available and value meets detected ioBroker installation."
     fi
@@ -92,7 +92,7 @@ set_objectsdb_port() {
       echo -n "Setting port of objects db to \"""$objectsdbport""\"... "
         jq --arg value "$objectsdbport" '.objects.port = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
         write_iobroker_json
-      echo 'Done.'
+      echo "Done."
     else
       echo "IOB_OBJECTSDB_PORT is available and value meets detected ioBroker installation."
     fi
@@ -104,13 +104,13 @@ set_objectsdb_pass() {
     echo -n "Removing password of objects db... "
       jq '.objects.options.auth_pass = null' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
       write_iobroker_json
-    echo 'Done.'
+    echo "Done."
   elif [[ "$objectsdbpass" != "$(jq -r '.objects.options.auth_pass' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
     echo "IOB_OBJECTSDB_PASS is available but value is different from detected ioBroker installation."
     echo -n "Setting password of objects db... "
       jq --arg value "$objectsdbpass" '.objects.options.auth_pass = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
       write_iobroker_json
-    echo 'Done.'
+    echo "Done."
   else
   echo "IOB_OBJECTSDB_PASS is available and value meets detected ioBroker installation."
   fi
@@ -121,7 +121,7 @@ set_statesdb_type() {
     echo -n "Setting type of states db to \"""$statesdbtype""\"... "
       jq --arg value "$statesdbtype" '.states.type = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
       write_iobroker_json
-    echo 'Done.'
+    echo "Done."
   else
     echo "IOB_STATESDB_TYPE is available and value meets detected ioBroker installation."
   fi
@@ -133,7 +133,7 @@ set_statesdb_host() {
       echo -n "Setting host of states db to \"""$statesdbhost""\"... "
         jq --arg value "$statesdbhost" '.states.host = ($value|split(","))' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
         write_iobroker_json
-      echo 'Done.'
+      echo "Done."
     else
       echo "IOB_STATESDB_HOST is available and value meets detected ioBroker installation."
     fi
@@ -143,7 +143,7 @@ set_statesdb_host() {
         echo -n "Setting name of states db to \"""$statesdbname""\"... "
           jq --arg value "$statesdbname" '.states.sentinelName = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
           write_iobroker_json
-        echo 'Done.'
+        echo "Done."
       else
         echo "IOB_STATESDB_NAME is available and value meets detected ioBroker installation."
       fi
@@ -153,7 +153,7 @@ set_statesdb_host() {
         echo -n "Setting name of states db to \"mymaster\"... "
           jq --arg value "mymaster" '.states.sentinelName = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
           write_iobroker_json
-        echo 'Done.'
+        echo "Done."
       else
         echo "IOB_STATESDB_NAME is not available but default value \"mymaster\" meets detected ioBroker installation.."
       fi
@@ -164,7 +164,7 @@ set_statesdb_host() {
       echo -n "Setting host of states db to \"""$statesdbhost""\"... "
         jq --arg value "$statesdbhost" '.states.host = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
         write_iobroker_json
-      echo 'Done.'
+      echo "Done."
     else
       echo "IOB_STATESDB_HOST is available and value meets detected ioBroker installation."
     fi
@@ -177,7 +177,7 @@ set_statesdb_port() {
       echo -n "Setting port of states db to \"""$statesdbport""\"... "
         jq --arg value "$statesdbport" '.states.port = ($value|split(","))' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
         write_iobroker_json
-      echo 'Done.'
+      echo "Done."
     else
       echo "IOB_STATESDB_PORT is available and value meets detected ioBroker installation."
     fi
@@ -187,7 +187,7 @@ set_statesdb_port() {
       echo -n "Setting port of states db to \"""$statesdbport""\"... "
         jq --arg value "$statesdbport" '.states.port = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
         write_iobroker_json
-      echo 'Done.'
+      echo "Done."
     else
       echo "IOB_STATESDB_PORT is available and value meets detected ioBroker installation."
     fi
@@ -199,19 +199,19 @@ set_statesdb_pass() {
     echo -n "Removing password of states db... "
       jq '.states.options.auth_pass = null' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
       write_iobroker_json
-    echo 'Done.'
+    echo "Done."
   elif [[ "$statesdbpass" != "$(jq -r '.states.options.auth_pass' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
     echo "IOB_STATESDB_PASS is available but value is different from detected ioBroker installation."
     echo -n "Setting password of states db... "
       jq --arg value "$statesdbpass" '.states.options.auth_pass = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
       write_iobroker_json
-    echo 'Done.'
+    echo "Done."
   else
     echo "IOB_STATESDB_PASS is available and value meets detected ioBroker installation."
   fi
 }
 config_error_output() {
-  echo ' '
+  echo " "
   echo "Something went wrong. Looks like at least one parameter defining the custom db connection was not set properly or is missing."
   echo "Please check your configuration and try again."
   echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
@@ -220,8 +220,8 @@ config_error_output() {
 # parameter check
 if [[ "$1" == "-master" ]]; then # setup master
   echo "IOB_MULTIHOST is available and set to \"master\"."
-  echo 'Done.'
-  echo ' '
+  echo "Done."
+  echo " "
   # multihost objects db
   if [[ "$objectsdbtype" != "" && "$objectsdbhost" != "" && "$objectsdbport" != "" ]]; then
     echo "Configuring custom objects db..."
@@ -229,15 +229,15 @@ if [[ "$1" == "-master" ]]; then # setup master
     set_objectsdb_host
     set_objectsdb_port
     if [[ "$objectsdbpass" != "" ]]; then set_objectsdb_pass; fi
-    echo 'Done.'
-    echo ' '
+    echo "Done."
+    echo " "
   elif [[ "$objectsdbtype" == "" && "$objectsdbhost" == "" && "$objectsdbport" == "" ]]; then
     echo "No custom objects db is set."
     if [[ "$(jq -r '.objects.host' /opt/iobroker/iobroker-data/iobroker.json)" != "0.0.0.0" ]]; then
       echo -n "Configuring default objects db to accept external connections... "
         jq --arg value "0.0.0.0" '.objects.host = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp 
         write_iobroker_json
-      echo 'Done.'
+      echo "Done."
     else
       echo "Default objects db is accepting external connections."
     fi
@@ -257,15 +257,15 @@ if [[ "$1" == "-master" ]]; then # setup master
     set_statesdb_host
     set_statesdb_port
     if [[ "$statesdbpass" != "" ]]; then set_statesdb_pass; fi
-    echo 'Done.'
-    echo ' '
+    echo "Done."
+    echo " "
   elif [[ "$statesdbtype" == "" && "$statesdbhost" == "" && "$statesdbport" == "" ]]; then
     echo "No custom states db is set."
     if [[ "$(jq -r '.states.host' /opt/iobroker/iobroker-data/iobroker.json)" != "0.0.0.0" ]]; then
       echo -n "Configuring default states db to accept external connections... "
         jq --arg value "0.0.0.0" '.states.host = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp 
         write_iobroker_json
-      echo 'Done.'
+      echo "Done."
     else
       echo "Default states db is accepting external connections."
     fi
@@ -280,8 +280,8 @@ if [[ "$1" == "-master" ]]; then # setup master
   fi
 elif [[ "$1" == "-slave" ]]; then # setup slave
   echo "IOB_MULTIHOST is available and set to \"slave\"."
-  echo 'Done.'
-  echo ' '
+  echo "Done."
+  echo " "
   # multihost slave objects db connection
   if [[ "$objectsdbtype" != "" && "$objectsdbhost" != "" && "$objectsdbport" != "" ]]; then
     echo "Configuring objects db connection..."
@@ -289,8 +289,8 @@ elif [[ "$1" == "-slave" ]]; then # setup slave
     set_objectsdb_host
     set_objectsdb_port
     if [[ "$objectsdbpass" != "" ]]; then set_objectsdb_pass; fi
-    echo 'Done.'
-    echo ' '
+    echo "Done."
+    echo " "
   else
     if [[ "$debug" == "true" ]]; then
       echo "[DEBUG] IOB_OBJECTSDB_TYPE = ""$objectsdbtype"
@@ -307,8 +307,8 @@ elif [[ "$1" == "-slave" ]]; then # setup slave
     set_statesdb_host
     set_statesdb_port
     if [[ "$statesdbpass" != "" ]]; then set_statesdb_pass; fi
-    echo 'Done.'
-    echo ' '
+    echo "Done."
+    echo " "
   else
     if [[ "$debug" == "true" ]]; then
       echo "[DEBUG] IOB_STATESDB_TYPE = ""$statesdbtype"
@@ -325,8 +325,8 @@ elif [[ "$1" == "-objectsdb" ]]; then # setup objects db standalone
     set_objectsdb_host
     set_objectsdb_port
     if [[ "$objectsdbpass" != "" ]]; then set_objectsdb_pass; fi
-    echo 'Done.'
-    echo ' '
+    echo "Done."
+    echo " "
   else
     if [[ "$debug" == "true" ]]; then
     echo "[DEBUG] IOB_OBJECTSDB_TYPE = ""$objectsdbtype"
@@ -343,8 +343,8 @@ elif [[ "$1" == "-statesdb" ]]; then # setup states db standalone
     set_statesdb_host
     set_statesdb_port
     if [[ "$statesdbpass" != "" ]]; then set_statesdb_pass; fi
-    echo 'Done.'
-    echo ' '
+    echo "Done."
+    echo " "
   else
     if [[ "$debug" == "true" ]]; then
     echo "[DEBUG] IOB_STATESDB_TYPE = ""$statesdbtype"
diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh
index 4d6ddb6..1db9a5f 100644
--- a/debian/scripts/setup_packages.sh
+++ b/debian/scripts/setup_packages.sh
@@ -16,7 +16,7 @@ check_package_preq() {
   if [[ "$i" == "influxdb" || "$i" == "influxdb2-cli" ]]; then
     # add influxdata repo keys
     wget -qO- https://repos.influxdata.com/influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null
-    echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list
+    echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main" | sudo tee /etc/apt/sources.list.d/influxdata.list
     apt-get -q update >> /opt/scripts/setup_packages.log 2>&1
   fi
 }
@@ -35,19 +35,19 @@ check_package_validity() {
       packages=$(echo "$packages" | sed 's/  / /g')
     done
     if [[ $debug == "true" ]]; then echo "[DEBUG] New list of packages: ""$packages"; fi
-    echo ' '
+    echo " "
   fi
 }
 
 if [[ "$1" == "-install" ]]; then
-  echo ' '
+  echo " "
   apt-get -q update >> /opt/scripts/setup_packages.log 2>&1
   check_package_validity
   for i in $packages; do
     if ! dpkg -s "$i" >/dev/null 2>&1; then
       echo -n "$i is not installed. Installing... "
       check_package_preq >> /opt/scripts/setup_packages.log 2>&1
-      if ! apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1; then
+      if ! apt-get -q -y --no-install-recommends install "$i" >> /opt/scripts/setup_packages.log 2>&1; then
         echo "Failed."
         echo "For more details see \"/opt/scripts/setup_packages.log\"."
       else
@@ -69,7 +69,7 @@ elif [[ "$1" == "-update" ]]; then
     echo "Make sure the container has internet access to get the latest package updates."
     echo "This has no impact to the setup process. The script will continue."
   else
-    echo 'Done.'
+    echo "Done."
   fi
 else
   echo "No paramerter found!"
@@ -78,6 +78,7 @@ fi
 
 # Silent Cleanup
 apt-get -qq autoclean -y && apt-get -qq autoremove && apt-get -qq clean
-rm -rf /tmp/* /var/tmp/* && rm -rf /root/.cache/* && rm -rf /var/lib/apt/lists/* && rm -f /opt/scripts/.docker_config/.packages
+rm -rf /tmp/* /var/tmp/* /root/.cache/* /var/lib/apt/lists/*
+rm -f /opt/scripts/.packages /opt/scripts/.docker_config/.packages
 
 exit 0
\ No newline at end of file
diff --git a/debian/scripts/setup_zwave.sh b/debian/scripts/setup_zwave.sh
index d85bbd6..8efd62e 100644
--- a/debian/scripts/setup_zwave.sh
+++ b/debian/scripts/setup_zwave.sh
@@ -2,16 +2,16 @@
 
 if [ -e /usr/local/lib64 ]
 then
-  echo '[setup_zwave.sh] Openzwave is already installed. Nothing to do here.'
+  echo "[setup_zwave.sh] Openzwave is already installed. Nothing to do here."
 else
-  echo -n '[setup_zwave.sh] Openzwave is NOT installed. Going to install it now... '
+  echo -n "[setup_zwave.sh] Openzwave is NOT installed. Going to install it now... "
     cd /opt || exit
     curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz
     tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz
     cd openzwave-1.6.1007 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
     ldconfig /usr/local/lib64
     cd /opt/iobroker || exit
-  echo 'Done.'
+  echo "Done."
 fi
 
 exit 0
diff --git a/debian/userscripts/userscript_everystart_example.sh b/debian/userscripts/userscript_everystart_example.sh
index 9023677..320e6a9 100644
--- a/debian/userscripts/userscript_everystart_example.sh
+++ b/debian/userscripts/userscript_everystart_example.sh
@@ -5,9 +5,9 @@
 
 # You can add your advanced script code here!
 
-echo ' '
+echo " "
 echo "I'm your startscript userscript_everystart.sh. I will run on EVERY container startup."
-echo ' '
+echo " "
 
 
 exit 0
diff --git a/debian/userscripts/userscript_firststart_example.sh b/debian/userscripts/userscript_firststart_example.sh
index 4fef50d..1e25e34 100644
--- a/debian/userscripts/userscript_firststart_example.sh
+++ b/debian/userscripts/userscript_firststart_example.sh
@@ -5,8 +5,8 @@
 
 # You can add your advanced script code here!
 
-echo ' '
+echo " "
 echo "I'm your startscript userscript_firststart.sh. I will run only on the FIRST startup of the container."
-echo ' '
+echo " "
 
 exit 0
diff --git a/docs/README_docker_hub_buanet.md b/docs/README_docker_hub_buanet.md
index d5f840a..691df4c 100644
--- a/docs/README_docker_hub_buanet.md
+++ b/docs/README_docker_hub_buanet.md
@@ -35,7 +35,8 @@ New major image versions (e.g. v6, v7, v8) always include a new major version of
 It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[major_version]` tag instead.
 
 ### Node 18 versions
-* [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile)
+* [`v8.1.0`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile)
+* [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.1/debian/node18/Dockerfile)
 * [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile)
 
 ### Node 16 versions
diff --git a/docs/README_docker_hub_iobroker.md b/docs/README_docker_hub_iobroker.md
index 378e63b..3a5bb4a 100644
--- a/docs/README_docker_hub_iobroker.md
+++ b/docs/README_docker_hub_iobroker.md
@@ -37,7 +37,8 @@ New major image versions (e.g. v6, v7, v8) always include a new major version of
 It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[major_version]` tag instead.
 
 ### Node 18 versions
-* [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile)
+* [`v8.1.0`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile)
+* [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.1/debian/node18/Dockerfile)
 * [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile)
 
 ### Node 16 versions