Merge branch 'main' of https://github.com/buanet/ioBroker.docker

prepare for v7.1.0
Merge pull request #288 from buanet/dependabot/github_actions/main/benc-uk/workflow-dispatch-1.2
2025-12-17 18:39:01 +02:00 · 2022-10-31 20:37:16 +01:00 · 2022-10-31 20:37:11 +01:00 · 2022-10-31 20:34:28 +01:00 · 2022-10-31 20:34:14 +01:00 · 2022-10-31 09:20:55 +00:00
27 changed files with 949 additions and 649 deletions
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v6.1.0-beta.1
+v7.1.0
--- a/.github/dependencies/.admin-version
+++ b/.github/dependencies/.admin-version
@@ -0,0 +1 @@
+6.2.23
--- a/.github/dependencies/.backitup-version
+++ b/.github/dependencies/.backitup-version
@@ -0,0 +1 @@
+2.4.12
--- a/.github/dependencies/.discovery-version
+++ b/.github/dependencies/.discovery-version
@@ -0,0 +1 @@
+3.0.5
--- a/.github/dependencies/.js-controller-version
+++ b/.github/dependencies/.js-controller-version
@@ -0,0 +1 @@
+4.0.23
--- a/.github/workflows/build-debian-image-beta-node18.yml
+++ b/.github/workflows/build-debian-image-beta-node18.yml
@@ -1,20 +1,20 @@
 # Github action to build Docker image from beta branch (tag: beta)
-name: Build buanet/iobroker:beta-node16
+name: Build debian beta-node18

 on:
  release:
-    types:
-      - prereleased
+    types: [prereleased]
+  workflow_dispatch:

 jobs:
-  build-beta-node16-image:
+  build-beta-node18-image:
    runs-on: ubuntu-latest
    steps:
      - name: Getting published prerelease tag
        run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
    
      - name: Checkout repo
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
        with:
          repository: 'buanet/ioBroker.docker'
          ref: ${{ env.RELEASE_TAG }}
@@ -35,80 +35,80 @@ jobs:
          sed -e "s/\${VERSION}/$VERSION/" -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/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp 
-          mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node18/Dockerfile > ./debian/node18/Dockerfile.tmp 
+          mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile

      - name: Set up manifest tool
        run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
          chmod +x manifest-tool

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2.1.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v1.6.0
+        uses: docker/setup-buildx-action@v2.2.1

      - name: Login to DockerHub
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASS }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

-      - name: Build Docker image (node16-amd64)
-        uses: docker/build-push-action@v2.7.0
+      - name: Build Docker image (node18-amd64)
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node16/Dockerfile
+          file: ./debian/node18/Dockerfile
          push: true
          platforms: linux/amd64
          tags: |
-            buanet/iobroker:${{ env.version }}-node16-amd64,
-            ghcr.io/buanet/iobroker:${{ env.version }}-node16-amd64
+            buanet/iobroker:${{ env.version }}-node18-amd64,
+            ghcr.io/buanet/iobroker:${{ env.version }}-node18-amd64

-      - name: Build Docker image (node16-arm32v7)
-        uses: docker/build-push-action@v2.7.0
+      - name: Build Docker image (node18-arm32v7)
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node16/Dockerfile
+          file: ./debian/node18/Dockerfile
          push: true
          platforms: linux/arm/v7
          tags: |
-            buanet/iobroker:${{ env.version }}-node16-arm32v7,
-            ghcr.io/buanet/iobroker:${{ env.version }}-node16-arm32v7
+            buanet/iobroker:${{ env.version }}-node18-arm32v7,
+            ghcr.io/buanet/iobroker:${{ env.version }}-node18-arm32v7

-      - name: Build Docker image (node16-arm64v8)
-        uses: docker/build-push-action@v2.7.0
+      - name: Build Docker image (node18-arm64v8)
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node16/Dockerfile
+          file: ./debian/node18/Dockerfile
          push: true
          platforms: linux/arm64/v8
          tags: |
-            buanet/iobroker:${{ env.version }}-node16-arm64v8,
-            ghcr.io/buanet/iobroker:${{ env.version }}-node16-arm64v8
+            buanet/iobroker:${{ env.version }}-node18-arm64v8,
+            ghcr.io/buanet/iobroker:${{ env.version }}-node18-arm64v8

      - name: Create and push manifests
        run: |
-          sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/beta-node16/g" ./manifest.yml > manifest_beta-node16.yaml
-          ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_beta-node16.yaml
-          sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/beta-node16/g" ./manifest_ghcr.yml > manifest_ghcr_beta-node16.yaml
-          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_beta-node16.yaml
-          sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/${{ env.version }}-node16/g" ./manifest.yml > manifest_version-node16.yaml
-          ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_version-node16.yaml
-          sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/${{ env.version }}-node16/g" ./manifest_ghcr.yml > manifest_ghcr_version-node16.yaml
-          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version-node16.yaml
+          sed -e "s/\${VERSION}/${{ env.version }}-node18/g" -e "s/\${DOCKERTAG}/beta-node18/g" ./manifest.yml > manifest_beta-node18.yaml
+          ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_beta-node18.yaml
+          sed -e "s/\${VERSION}/${{ env.version }}-node18/g" -e "s/\${DOCKERTAG}/beta-node18/g" ./manifest_ghcr.yml > manifest_ghcr_beta-node18.yaml
+          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_beta-node18.yaml
+          sed -e "s/\${VERSION}/${{ env.version }}-node18/g" -e "s/\${DOCKERTAG}/${{ env.version }}-node18/g" ./manifest.yml > manifest_version-node18.yaml
+          ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_version-node18.yaml
+          sed -e "s/\${VERSION}/${{ env.version }}-node18/g" -e "s/\${DOCKERTAG}/${{ env.version }}-node18/g" ./manifest_ghcr.yml > manifest_ghcr_version-node18.yaml
+          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version-node18.yaml

      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
        with:
          github-token: ${{ secrets.PACKAGES_PASS }}
          script: |
--- a/.github/workflows/build-debian-image-beta.yml
+++ b/.github/workflows/build-debian-image-beta.yml
@@ -1,10 +1,10 @@
 # Github action to build Docker image from beta branch (tag: beta)
-name: Build buanet/iobroker:beta
+name: Build debian beta

 on:
  release:
-    types:
-      - prereleased
+    types: [prereleased]
+  workflow_dispatch:

 jobs:
  build-beta-image:
@@ -14,7 +14,7 @@ jobs:
        run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
    
      - name: Checkout repo
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
        with:
          repository: 'buanet/ioBroker.docker'
          ref: ${{ env.RELEASE_TAG }}
@@ -35,39 +35,39 @@ jobs:
          sed -e "s/\${VERSION}/$VERSION/" -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/" -e "s/\${DATI}/$DATI/" ./debian/node14/Dockerfile > ./debian/node14/Dockerfile.tmp 
-          mv -f ./debian/node14/Dockerfile.tmp ./debian/node14/Dockerfile
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp 
+          mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile

      - name: Set up manifest tool
        run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
          chmod +x manifest-tool

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2.1.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v1.6.0
+        uses: docker/setup-buildx-action@v2.2.1

      - name: Login to DockerHub
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASS }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/amd64
          tags: |
@@ -75,10 +75,10 @@ jobs:
            ghcr.io/buanet/iobroker:${{ env.version }}-amd64

      - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/arm/v7
          tags: |
@@ -86,10 +86,10 @@ jobs:
            ghcr.io/buanet/iobroker:${{ env.version }}-arm32v7

      - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/arm64/v8
          tags: |
@@ -108,7 +108,7 @@ jobs:
          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version.yaml

      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
        with:
          github-token: ${{ secrets.PACKAGES_PASS }}
          script: |
--- a/.github/workflows/build-debian-image-dev-node18.yml
+++ b/.github/workflows/build-debian-image-dev-node18.yml
@@ -1,15 +1,15 @@
 # Github action to build Docker image from dev branch (tag: dev)
-name: Build buanet/iobroker:dev-node16
+name: Build debian dev-node18

 on:
  workflow_dispatch:

 jobs:
-  build-dev-node16-image:
+  build-dev-node18-image:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo (dev)
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
        with:
          repository: 'buanet/ioBroker.docker'
          ref: 'main'
@@ -30,76 +30,76 @@ jobs:
          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/node16/Dockerfile > ./debian/node16/Dockerfile.tmp 
-          mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile
+          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 manifest tool
        run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
          chmod +x manifest-tool

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2.1.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v1.6.0
+        uses: docker/setup-buildx-action@v2.2.1

      - name: Login to DockerHub
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASS }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

-      - name: Build Docker image (node16-amd64)
-        uses: docker/build-push-action@v2.7.0
+      - name: Build Docker image (node18-amd64)
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node16/Dockerfile
+          file: ./debian/node18/Dockerfile
          push: true
          platforms: linux/amd64
          tags: |
-            buanet/iobroker:dev-node16-amd64,
-            ghcr.io/buanet/iobroker:dev-node16-amd64
+            buanet/iobroker:dev-node18-amd64,
+            ghcr.io/buanet/iobroker:dev-node18-amd64

-      - name: Build Docker image (node16-arm32v7)
-        uses: docker/build-push-action@v2.7.0
+      - name: Build Docker image (node18-arm32v7)
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node16/Dockerfile
+          file: ./debian/node18/Dockerfile
          push: true
          platforms: linux/arm/v7
          tags: |
-            buanet/iobroker:dev-node16-arm32v7,
-            ghcr.io/buanet/iobroker:dev-node16-arm32v7
+            buanet/iobroker:dev-node18-arm32v7,
+            ghcr.io/buanet/iobroker:dev-node18-arm32v7

-      - name: Build Docker image (node16-arm64v8)
-        uses: docker/build-push-action@v2.7.0
+      - name: Build Docker image (node18-arm64v8)
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node16/Dockerfile
+          file: ./debian/node18/Dockerfile
          push: true
          platforms: linux/arm64/v8
          tags: |
-            buanet/iobroker:dev-node16-arm64v8,
-            ghcr.io/buanet/iobroker:dev-node16-arm64v8
+            buanet/iobroker:dev-node18-arm64v8,
+            ghcr.io/buanet/iobroker:dev-node18-arm64v8

      - name: Create and push manifests
        run: |
-          sed -e "s/\${VERSION}/dev-node16/g" -e "s/\${DOCKERTAG}/dev-node16/g" ./manifest.yml > manifest_dev-node16.yaml
-          ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_dev-node16.yaml
-          sed -e "s/\${VERSION}/dev-node16/g" -e "s/\${DOCKERTAG}/dev-node16/g" ./manifest_ghcr.yml > manifest_ghcr_dev-node16.yaml
-          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev-node16.yaml
+          sed -e "s/\${VERSION}/dev-node18/g" -e "s/\${DOCKERTAG}/dev-node18/g" ./manifest.yml > manifest_dev-node18.yaml
+          ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_dev-node18.yaml
+          sed -e "s/\${VERSION}/dev-node18/g" -e "s/\${DOCKERTAG}/dev-node18/g" ./manifest_ghcr.yml > manifest_ghcr_dev-node18.yaml
+          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev-node18.yaml

      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
        with:
          github-token: ${{ secrets.PACKAGES_PASS }}
          script: |
--- a/.github/workflows/build-debian-image-dev.yml
+++ b/.github/workflows/build-debian-image-dev.yml
@@ -1,5 +1,5 @@
 # Github action to build Docker image from dev branch (tag: dev)
-name: Build buanet/iobroker:dev
+name: Build debian dev

 on:
  workflow_dispatch:
@@ -9,10 +9,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo (dev)
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
        with:
          repository: 'buanet/ioBroker.docker'
-          ref: 'main'
+          # ref: 'main'

      - name: Get and write version and date
        id: version
@@ -30,39 +30,39 @@ jobs:
          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/node14/Dockerfile > ./debian/node14/Dockerfile.tmp 
-          mv -f ./debian/node14/Dockerfile.tmp ./debian/node14/Dockerfile
+          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp 
+          mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile

      - name: Set up manifest tool
        run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
          chmod +x manifest-tool

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2.1.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v1.6.0
+        uses: docker/setup-buildx-action@v2.2.1

      - name: Login to DockerHub
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASS }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/amd64
          tags: |
@@ -70,10 +70,10 @@ jobs:
            ghcr.io/buanet/iobroker:dev-amd64

      - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/arm/v7
          tags: |
@@ -81,10 +81,10 @@ jobs:
            ghcr.io/buanet/iobroker:dev-arm32v7

      - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/arm64/v8
          tags: |
@@ -99,7 +99,7 @@ jobs:
          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev.yaml

      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
        with:
          github-token: ${{ secrets.PACKAGES_PASS }}
          script: |
--- a/.github/workflows/build-debian-image-latest-iob.yml
+++ b/.github/workflows/build-debian-image-latest-iob.yml
@@ -1,25 +1,29 @@
 # Github action to build Docker image from main branch for iobroker/iobroker (tag: latest)
-name: Build iobroker/iobroker:latest
+name: Build debian latest (iobroker)

 on:
  release:
    types:
      - released
+  workflow_dispatch:

 jobs:
  build-latest-image:
    runs-on: ubuntu-latest
    steps:
-      - name: Getting published release tag
-        run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name: Fetching latest release tag
+        run: |
+          LATESTRELEASE="$(curl -sL https://api.github.com/repos/buanet/ioBroker.docker/releases/latest | jq -r '.tag_name')"
+          echo "Latest release tag : $LATESTRELEASE"
+          echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
    
      - name: Checkout repo
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
        with:
          repository: 'buanet/ioBroker.docker'
          ref: ${{ env.RELEASE_TAG }}

-      - name: Get and write version and date
+      - name: Fetching and adding version tag and date
        id: version
        run: |
          VERSION="$(cat .VERSION)"
@@ -35,52 +39,52 @@ jobs:
          sed -e "s/\${VERSION}/$VERSION/" -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/" -e "s/\${DATI}/$DATI/" ./debian/node14/Dockerfile > ./debian/node14/Dockerfile.tmp 
-          mv -f ./debian/node14/Dockerfile.tmp ./debian/node14/Dockerfile
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp 
+          mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile

      - name: Set up manifest tool
        run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
          chmod +x manifest-tool

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2.1.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v1.6.0
+        uses: docker/setup-buildx-action@v2.2.1

      - name: Login to DockerHub (iobroker)
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          username: ${{ secrets.DOCKER_USER_IOB }}
          password: ${{ secrets.DOCKER_PASS_IOB }}

      - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/amd64
          tags: |
            iobroker/iobroker:${{ env.version }}-amd64,

      - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/arm/v7
          tags: |
            iobroker/iobroker:${{ env.version }}-arm32v7,

      - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/arm64/v8
          tags: |
--- a/.github/workflows/build-debian-image-latest.yml
+++ b/.github/workflows/build-debian-image-latest.yml
@@ -1,25 +1,29 @@
 # Github action to build Docker image from main branch (tag: latest)
-name: Build buanet/iobroker:latest
+name: Build debian latest (buanet)

 on:
  release:
    types:
      - released
+  workflow_dispatch:

 jobs:
  build-latest-image:
    runs-on: ubuntu-latest
    steps:
-      - name: Getting published release tag
-        run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name: Fetching latest release tag
+        run: |
+          LATESTRELEASE="$(curl -sL https://api.github.com/repos/buanet/ioBroker.docker/releases/latest | jq -r '.tag_name')"
+          echo "Latest release tag : $LATESTRELEASE"
+          echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV

      - name: Checkout repo
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
        with:
          repository: 'buanet/ioBroker.docker'
          ref: ${{ env.RELEASE_TAG }}

-      - name: Get and write version and date
+      - name: Fetching and adding version tag and date
        id: version
        run: |
          VERSION="$(cat .VERSION)"
@@ -35,39 +39,39 @@ jobs:
          sed -e "s/\${VERSION}/$VERSION/" -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/" -e "s/\${DATI}/$DATI/" ./debian/node14/Dockerfile > ./debian/node14/Dockerfile.tmp 
-          mv -f ./debian/node14/Dockerfile.tmp ./debian/node14/Dockerfile
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp 
+          mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile

      - name: Set up manifest tool
        run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
          chmod +x manifest-tool

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.2.0
+        uses: docker/setup-qemu-action@v2.1.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v1.6.0
+        uses: docker/setup-buildx-action@v2.2.1

      - name: Login to DockerHub (buanet)
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASS }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v2.1.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/amd64
          tags: |
@@ -75,10 +79,10 @@ jobs:
            ghcr.io/buanet/iobroker:${{ env.version }}-amd64

      - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/arm/v7
          tags: |
@@ -86,10 +90,10 @@ jobs:
            ghcr.io/buanet/iobroker:${{ env.version }}-arm32v7

      - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
          push: true
          platforms: linux/arm64/v8
          tags: |
@@ -112,7 +116,7 @@ jobs:
          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version.yaml

      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
        with:
          github-token: ${{ secrets.PACKAGES_PASS }}
          script: |
--- a/.github/workflows/check-iobroker-versions.yml
+++ b/.github/workflows/check-iobroker-versions.yml
@@ -0,0 +1,59 @@
+name: Check ioBroker versions
+
+on:
+  schedule:
+    - cron: '42 23 * * *'
+  workflow_dispatch:
+
+jobs:
+  check-and-trigger:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          repository: 'buanet/ioBroker.docker'
+          token: ${{ secrets.ACTIONS_PAT }}
+
+      - name: Fetch ioBroker versions
+        run: |
+          curl -sL https://repo.iobroker.live/sources-dist.json | \
+          jq -r '."js-controller".version' > .github/dependencies/.js-controller-version
+          echo "[LOG] Fetched js-controller version is $(cat .github/dependencies/.js-controller-version)"
+          curl -sL https://repo.iobroker.live/sources-dist.json | \
+          jq -r '."admin".version' > .github/dependencies/.admin-version
+          echo "[LOG] Fetched admin version is $(cat .github/dependencies/.admin-version)"
+          curl -sL https://repo.iobroker.live/sources-dist.json | \
+          jq -r '."backitup".version' > .github/dependencies/.backitup-version
+          echo "[LOG] Fetched backitup version is $(cat .github/dependencies/.backitup-version)"
+          curl -sL https://repo.iobroker.live/sources-dist.json | \
+          jq -r '."discovery".version' > .github/dependencies/.discovery-version
+          echo "[LOG] Fetched discovery version is $(cat .github/dependencies/.discovery-version)"
+
+      - name: Check for modified files
+        id: git-check
+        run: echo ::set-output name=modified::$([ -z "`git status --porcelain`" ] && echo "false" || echo "true")
+
+      - name: Commit latest release version
+        if: steps.git-check.outputs.modified == 'true'
+        run: |
+          git config --global user.name 'buanet'
+          git config --global user.email 'info@buanet.de'
+          git commit -am "new ioBroker versions"
+          git push
+
+      - name: Trigger build debian latest (buanet)
+        if: steps.git-check.outputs.modified == 'true'
+        uses: benc-uk/workflow-dispatch@v1.2
+        with:
+          workflow: Build debian latest (buanet)
+          repo: buanet/ioBroker.docker
+          token: ${{ secrets.ACTIONS_PAT }}
+
+      - name: Trigger build debian latest (iobroker)
+        if: steps.git-check.outputs.modified == 'true'
+        uses: benc-uk/workflow-dispatch@v1.2
+        with:
+          workflow: Build debian latest (iobroker)
+          repo: buanet/ioBroker.docker
+          token: ${{ secrets.ACTIONS_PAT }}
--- a/.github/workflows/testing-docker-image.yml
+++ b/.github/workflows/testing-docker-image.yml
@@ -0,0 +1,33 @@
+# Github action for testing the Docker image
+name: Testing Docker image
+
+on:
+  workflow_dispatch:
+
+jobs:
+  test-docker-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Testing with docker run
+        run: |
+          echo "[LOG] Starting ioBroker Container..."
+          docker run -d -p 8081:8081 --name iobroker -v iobrokerdata:/opt/iobroker buanet/iobroker:latest
+          echo "[LOG] Done."
+          echo ' '
+          echo "[LOG] Waiting for Startup Script..."
+          sleep 30
+          echo "[LOG] Done."
+          echo ' '
+          echo "[LOG] Writing Logs..."
+          docker logs iobroker >& testrun.log
+          echo "[LOG] Done."
+          echo ' '
+          echo "[LOG] Checking Web UI..."
+          curl --insecure http://127.0.0.1:8081 2> /dev/null | grep '<title>Admin</title>' &> /dev/null || exit 1
+          echo "[LOG] Done."
+          echo ' '
+          echo "[LOG] Output testrun.log:"
+          cat testrun.log
+          echo ' '
+          echo "[LOG] Test sucesssful."
+          echo ' '
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,51 @@
 ## Changelog

-### v6.1.0-beta.1 (2021-12-23)
-* some more corrections in maintenance script ([#232 @agross](https://github.com/buanet/ioBroker.docker/pull/232)) 
-* added autoconfirm parameter to upgrade function in maintenance script ([#229 @thost96](https://github.com/buanet/ioBroker.docker/pull/229))
-* added alias "m" for maintenance script
+### v7.1.0 (31.10.2022)
+* fix [build action node issue](https://forum.iobroker.net/topic/59518/docker-image-7-0-1-auf-node-js-14/14?_=1667244004952) for iobroker/iobroker repo
+* v7.1.0-beta.1 (12.10.2022)
+  * add env DEBUG for extended debugging log
+  * enhance logging in iobroker-startuo.sh
+  * enhance build process
+  * add restart option to maintenance script
+  * add strict mode for iobroker-startup.sh
+  * fix "unary operator expected" error
+
+### v7.0.1 (05.07.2022)
+* backitup restore patch
+
+### v7.0.0 (21.06.2022)
+* update docs & ci
+* v7.0.0-beta.1 (16.06.2022)
+  * upgrade node version to recommended node16 
+  * rewrite maintenance script ([#243 by @agross](https://github.com/buanet/ioBroker.docker/pull/243))
+  * enhance container shutdown on SIGTERM ([as requested with #264 by @buzz0r](https://github.com/buanet/ioBroker.docker/pull/264))
+  * enhance startup script logging
+  * enhance logging for avahi & zwave install scripts
+  * add new env for offline mode (fixes [#255](https://github.com/buanet/ioBroker.docker/issues/255))
+
+### v6.1.0 (2022-03-01)
+* v6.1.0-beta.2 (2022-02-11)
+  * fix -kbn option in maintenance script
+  * enhance shutdown/ prevent warnings on upgrade
+  * remove hostname check for multihost slave
+  * enhance startup script logging
+  * add breaks and enhance maintenance script (fixes [#233](https://github.com/buanet/ioBroker.docker/issues/233))
+* v6.1.0-beta.1 (2021-12-23)
+  * some more corrections in maintenance script ([#232 by @agross](https://github.com/buanet/ioBroker.docker/pull/232)) 
+  * add auto confirm parameter to upgrade function in maintenance script ([#229 by @thost96](https://github.com/buanet/ioBroker.docker/pull/229))
+  * add alias "m" for maintenance script

 ### v6.0.0 (2021-12-09)
-* moving docu/ restructuring readme
+* move docs/ restructuring readme
 * v6.0.0-beta1 (2021-10-07)
-  * upgrading node version to recommended node14 
-  * adding beta-node16 tag for beta testing node16
-  * updating documentation
+  * upgrade node version to recommended node14 
+  * add beta-node16 tag for beta testing node16
+  * update documentation
 * v5.3.0-beta1 (2021-10-07)
-  * adding check  (installed) PACKAGES on startup (fixes [#201](https://github.com/buanet/ioBroker.docker/issues/201))
-  * adding packages for discovery adapter
-  * adding packages for backitup adapter
-  * reorganizing Dockerfile
+  * add check (installed) PACKAGES on startup (fixes [#201](https://github.com/buanet/ioBroker.docker/issues/201))
+  * add packages for discovery adapter
+  * add packages for backitup adapter
+  * reorganize Dockerfile

 ### v5.2.0 (2021-09-30)
 * v5.2.0-beta4 (2021-09-10)
@@ -26,7 +56,7 @@
 * v5.2.0-beta3 (2021-09-04)
  * reducing layers in dockerfile
  * making hostname check mandatory for startup
-  * optimize startup log
+  * enhance startup log
 * v5.2.0-beta2 (2021-08-28)
  * redesign maintenance script
  * switching amd64 base image to debian bullseye slim 
@@ -41,7 +71,7 @@
  * added expose for default admin ui port (fixes [#172](https://github.com/buanet/ioBroker.docker/issues/172))
  * added short form for maintenance script
 * v5.2.0-beta (2021-04-02)
-  * some renaming to optimize automated build
+  * some renaming to enhance automated build
  * changes in versioning
  * delete travis for automated build

@@ -56,7 +86,7 @@
  * fixing backup detection in startup script
  * fixing permission issue on iobroker restored
  * extended Logging
-  * optimize multihost support
+  * enhance multihost support

 ### v5.0.0 (2020-06-29)
 * v4.2.4-beta (2020-06-23)
@@ -89,7 +119,7 @@
 ### v4.1.0 (2020-01-17)
 * improved readme.md
 * v4.0.3-beta (2020-01-06)
-  * added support to restore backup on startup ([#56 @duffbeer2000](https://github.com/buanet/ioBroker.docker/pull/56))
+  * added support to restore backup on startup ([#56 by @duffbeer2000](https://github.com/buanet/ioBroker.docker/pull/56))
  * small fixes according to "docker best practices"
 * v4.0.2-beta (2019-12-10)
  * ~~added env for activating redis~~
@@ -109,13 +139,13 @@
 * v3.1.2-beta (2019-09-03)
  * using node 10 instead of node 8
 * v3.1.1-beta (2019-09-02)
-  * adding env for setting uid/ gid for iobroker-user ([#33 @mplogas](https://github.com/buanet/ioBroker.docker/pull/33))
+  * adding env for setting uid/ gid for iobroker-user ([#33 by @mplogas](https://github.com/buanet/ioBroker.docker/pull/33))

 ### v3.1.0 (2019-08-21)
 * v3.0.3-beta (2019-08-21)
  * switching base image from "debian:latest" to "debian:stretch"
 * v3.0.2-beta (2019-06-13)
-  * using gosu instead of sudo ([#26 @SchumyHao](https://github.com/buanet/ioBroker.docker/pull/26))
+  * using gosu instead of sudo ([#26 by @SchumyHao](https://github.com/buanet/ioBroker.docker/pull/26))
  * changing output of ioBroker logging
 * v3.0.1-beta (2019-05-18)
  * ~~switching back to iobroker-daemon for startup~~
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2017-2021 André Germann
+Copyright (c) 2017-2022 André Germann

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -1,15 +1,20 @@
 # Official Docker Image for ioBroker

- <img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/iobroker_logo.png" width="600" title="ioBroker Logo">
+ <img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/iobroker_logo.png" width="600" title="ioBroker Logo">

+[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/releases)
+[![GitHub tag (latest SemVer pre-release)](https://img.shields.io/github/v/tag/buanet/ioBroker.docker?include_prereleases&label=pre-release)](https://github.com/buanet/ioBroker.docker/releases)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/buanet/ioBroker.docker/Build%20debian%20latest%20\(buanet\))](https://github.com/buanet/ioBroker.docker/actions/workflows/build-debian-image-latest.yml)
+[![Github Issues](https://img.shields.io/github/issues/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/issues)
+[![GitHub Discussions](https://img.shields.io/github/discussions/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/discussions)<br>
+[![Arch](https://img.shields.io/badge/arch-amd64%20%7C%20arm32v7%20%7C%20arm64v8-blue)](https://hub.docker.com/repository/docker/buanet/iobroker)
 [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
 [![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
 [![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)<br>
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/buanet/ioBroker.docker/Build%20debian%20based%20image%20\(latest\))](https://github.com/buanet/ioBroker.docker/actions/workflows/build-debian-image-main.yml)
-[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/releases)
-[![Github Issues](https://img.shields.io/github/issues/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/issues)<br>
-[![Source](https://img.shields.io/badge/source-github-blue?style=flat)](https://github.com/buanet/ioBroker.docker)
 [![License](https://img.shields.io/github/license/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md)
+[![Source](https://img.shields.io/badge/source-github-blue?style=flat)](https://github.com/buanet/ioBroker.docker)
+[![GitHub forks](https://img.shields.io/github/forks/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/network)
+[![GitHub stars](https://img.shields.io/github/stars/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/stargazers)
 [![Donate](https://img.shields.io/badge/donate-paypal-blue?style=flat)](https://paypal.me/buanet)

 The code provided in this repo is used to automatically generate the official Docker Image for ioBroker.
@@ -26,7 +31,7 @@ Looking for documentation? :arrow_right: [docs.buanet.de](https://docs.buanet.de

 ### How to run the image? 

-You can find some basic information about the image amd how to run it on the [Docker Hub page](https://hub.docker.com/r/buanet/iobroker) or [here](https://github.com/buanet/ioBroker.docker/blob/main/src/README_docker_hub_buanet.md).
+You can find some basic information about the image amd how to run it on the [Docker Hub page](https://hub.docker.com/r/buanet/iobroker) or [here](https://github.com/buanet/ioBroker.docker/blob/main/docs/README_docker_hub_buanet.md).

 ### Is there a more detailed documentation?

@@ -55,13 +60,13 @@ Please do not use the issues for support questions. Not every error message is w

 ### Beta testing

-If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. You can find the changelog for beta versions [here](https://github.com/buanet/ioBroker.docker/blob/dev/CHANGELOG.md). For more details and beta support join us at the "docker-image" chat on the [ioBroker Discord channel](https://discord.gg/Ne3y6fUac3).
+If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. For more details and beta support join us at "beta testing & feedback" > "docker-image" on the [ioBroker Discord channel](https://discord.gg/Ne3y6fUac3).

 ### Support the project

 The easiest way to support this project is to leave me some likes/ stars on Github and Docker hub!<br>
 If you want to give something back to the community, feel free to take a look into the [open issues](https://github.com/buanet/ioBroker.docker/issues) or the [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) and help me answering questions, fixing bugs or adding new features!<br>
-If that doesn't work for you and you want to buy me a beer instead, you can do this here: <a href="https://www.paypal.me/buanet" target="_blank"><img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/pp_logo.png" height="15" width="15"></a><br>
+If that doesn't work for you and you want to buy me a beer instead, you can do this here: <a href="https://www.paypal.me/buanet" target="_blank"><img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/pp_logo.png" height="15" width="15"></a><br>
 Thank you!

 ## :memo: Changelog
@@ -72,7 +77,7 @@ Moved to [CHANGELOG.md](CHANGELOG.md).

 MIT License

-Copyright (c) 2017-2021 André Germann
+Copyright (c) 2017-2022 André Germann

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/debian/node18/Dockerfile
+++ b/debian/node18/Dockerfile
@@ -0,0 +1,97 @@
+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_18.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"]
--- a/debian/scripts/iobroker_startup.sh
+++ b/debian/scripts/iobroker_startup.sh
@@ -1,12 +1,18 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+# bash strict mode
+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
 adminport=$IOB_ADMINPORT
 avahi=$AVAHI
+debug=$DEBUG
 multihost=$IOB_MULTIHOST
+offlinemode=$OFFLINE_MODE
 objectsdbhost=$IOB_OBJECTSDB_HOST
 objectsdbport=$IOB_OBJECTSDB_PORT
 objectsdbtype=$IOB_OBJECTSDB_TYPE
@@ -18,6 +24,9 @@ statesdbport=$IOB_STATESDB_PORT
 statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
+set -u
+
+pkill_timeout=10      # timeout for iobroker shutdown in seconds

 # Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
@@ -27,42 +36,47 @@ 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})"
-echo ' '
-echo "$(printf -- '-%.0s' {1..80})"
-echo "-----                 Welcome to your ioBroker-container!                  -----"
-echo "-----                    Startupscript is now running.                     -----"
+echo '-----                                                                      -----'
+echo "----- ██╗  ██████╗  ██████╗  ██████╗   ██████╗  ██╗  ██╗ ███████╗ ██████╗  -----"
+echo "----- ██║ ██╔═══██╗ ██╔══██╗ ██╔══██╗ ██╔═══██╗ ██║ ██╔╝ ██╔════╝ ██╔══██╗ -----"
+echo "----- ██║ ██║   ██║ ██████╔╝ ██████╔╝ ██║   ██║ █████╔╝  █████╗   ██████╔╝ -----"
+echo "----- ██║ ██║   ██║ ██╔══██╗ ██╔══██╗ ██║   ██║ ██╔═██╗  ██╔══╝   ██╔══██╗ -----"
+echo "----- ██║ ╚██████╔╝ ██████╔╝ ██║  ██║ ╚██████╔╝ ██║  ██╗ ███████╗ ██║  ██║ -----"
+echo "----- ╚═╝  ╚═════╝  ╚═════╝  ╚═╝  ╚═╝  ╚═════╝  ╚═╝  ╚═╝ ╚══════╝ ╚═╝  ╚═╝ -----"
+echo '-----                                                                      -----'
+echo "-----              Welcome to your ioBroker Docker container!              -----"
+echo "-----                    Startupscript is now running!                     -----"
 echo "-----                          Please be patient!                          -----"
 echo "$(printf -- '-%.0s' {1..80})"
 echo ' '
 echo "$(printf -- '-%.0s' {1..80})"
-echo "-----                        Debugging information                         -----"
-echo "-----                                                                      -----"
-echo "-----                                System                                -----"
+echo "-----                          System Information                          -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" arch: $(uname -m))" && echo " -----"
+echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" hostname: $(hostname))" && echo " -----"
 echo "-----                                                                      -----"
-echo "-----                             Docker-Image                             -----"
+echo "-----                          Version Information                         -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" image: ${VERSION})" && echo " -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" build: ${BUILD})" && echo " -----"
-echo "-----                                                                      -----"
-echo "-----                               Versions                               -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" node: $(node -v))" && echo " -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" npm: $(npm -v))" && echo " -----"
 echo "-----                                                                      -----"
-echo "-----                                 ENV                                  -----"
-if [ "$adminport" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_ADMINPORT: $adminport)" && echo " -----"; fi
-if [ "$avahi" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" AVAHI: $avahi)" && echo " -----"; fi
-if [ "$multihost" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_MULTIHOST: $multihost)" && echo " -----"; fi
-if [ "$objectsdbhost" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
-if [ "$objectsdbport" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
-if [ "$objectsdbtype" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
-if [ "$packages" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" PACKAGES: $packages)" && echo " -----"; fi
-if [ "$setgid" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" SETGID: $setgid)" && echo " -----"; fi
-if [ "$setuid" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" SETUID: $setuid)" && echo " -----"; fi
-if [ "$statesdbhost" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
-if [ "$statesdbport" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
-if [ "$statesdbtype" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi
-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 "-----                        Environment Variables                         -----"
+if [[ "$adminport" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_ADMINPORT: $adminport)" && echo " -----"; fi
+if [[ "$avahi" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" AVAHI: $avahi)" && echo " -----"; fi
+if [[ "$debug" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" DEBUG: $debug)" && echo " -----"; fi
+if [[ "$multihost" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_MULTIHOST: $multihost)" && echo " -----"; fi
+if [[ "$objectsdbhost" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
+if [[ "$objectsdbport" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
+if [[ "$objectsdbtype" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
+if [[ "$statesdbhost" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
+if [[ "$statesdbport" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
+if [[ "$statesdbtype" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi
+if [[ "$offlinemode" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" OFFLINE_MODE: $offlinemode)" && echo " -----"; fi
+if [[ "$packages" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" PACKAGES: "$packages")" && echo " -----"; fi
+if [[ "$setgid" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" SETGID: $setgid)" && echo " -----"; fi
+if [[ "$setuid" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" SETUID: $setuid)" && echo " -----"; fi
+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 ' '

@@ -74,49 +88,55 @@ echo "-----                  Step 1 of 5: Preparing container
 echo "$(printf -- '-%.0s' {1..80})"
 echo ' '

-# Installing/updating additional packages, registering maintenance script and setting uid/gid
-if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] || [ -f /opt/.firstrun ]
-then
-  if [ -f /opt/.firstrun ]
-  then
-    echo "Updating Linux packages on first run..."
-      bash /opt/scripts/setup_packages.sh -update
-    echo "Done."
+# Actions running on first start only
+if [[ -f /opt/.firstrun ]]; then
+  # Updating Linux packages
+  if [[ "$offlinemode" = "true" ]]; then
+    echo 'OFFLINE_MODE is \"true\". Skipping Linux package updates on first run.'
    echo ' '
-    echo "Registering maintenance script as command..."
+  else
+    echo 'Updating Linux packages on first run...'
+      bash /opt/scripts/setup_packages.sh -update
+    echo 'Done.'
+    echo ' '
+  fi
+  # Installing packages from ENV
+  if [[ "$packages" != "" && "$offlinemode" = "true" ]]; then
+    echo 'PACKAGES is set, but OFFLINE_MODE is \"true\". Skipping Linux package installation.'
+    echo ' '
+  else
+    echo 'PACKAGES is set. Installing additional Linux packages.'
+    echo "Checking the following packages:" $packages"..."
+    echo $packages > /opt/scripts/.docker_config/.packages
+      bash /opt/scripts/setup_packages.sh -install
+    echo 'Done.'
+    echo ' '
+  fi
+  # 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 'Done.'
+  echo ' '
+else
+  echo 'This is not the first run of this container. Skipping first run preparation.'
  echo ' '
 fi
-  if [ "$packages" != "" ]
-  then
-    echo "Installing additional packages is set by ENV."
-    echo "Checking the following Packages:" $packages"..."
-    echo $packages > /opt/scripts/.docker_config/.packages
-      bash /opt/scripts/setup_packages.sh -install
-    echo "Done."
-    echo ' '
-  fi
-  if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
-  then
-    echo "Different UID and/ or GID is set by ENV."
-    echo "Changing UID to "$setuid" and GID to "$setgid"..."
+
+# 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
+  echo "SETUID and/ or SETGID are set to individual values."
+  echo -n "Changing UID to "$setuid" and GID to "$setgid"... "
    usermod -u $setuid iobroker
    groupmod -g $setgid iobroker
-    echo "Done."
-    echo ' '
-  fi
-else
-  echo "Nothing to do here."
+  echo 'Done.'
  echo ' '
 fi

 # Change directory for next steps
 cd /opt/iobroker

-
 #####
 # STEP 2 - Detecting ioBroker-Installation
 #####
@@ -125,40 +145,39 @@ echo "-----             Step 2 of 5: Detecting ioBroker installation
 echo "$(printf -- '-%.0s' {1..80})"
 echo ' '

-if [ `find /opt/iobroker -type f | wc -l` -lt 1 ]
-then
+if [[ `find /opt/iobroker -type f | wc -l` -lt 1 ]]; then
  echo "There is no data detected in /opt/iobroker."
-  echo "Restoring initial ioBroker installation..."
+  echo -n "Restoring initial ioBroker installation... "
    tar -xf /opt/initial_iobroker.tar -C /
-  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
-  if [ "$multihost" = "slave" ]
-  then
+  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
+  if [[ "$multihost" = "slave" ]]; then
    echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"."
    echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over."
-    echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
+    echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
    exit 1
  else
    echo "IoBroker backup file detected in /opt/iobroker."
-    echo "Preparing restore..."
+    if [[ "$debug" == "true" ]]; then
+      echo "[DEBUG] Backup file name: " $(ls *_backupiobroker.tar.gz) 
+    fi
+    echo -n "Preparing restore... "
      mv /opt/iobroker/*.tar.gz /opt/
      tar -xf /opt/initial_iobroker.tar -C /
      mkdir /opt/iobroker/backups
      mv /opt/*.tar.gz /opt/iobroker/backups/
      # fixing permission errors during restore
      chown -R $setuid:$setgid /opt/iobroker
-    echo "Done."
-    echo "Restoring ioBroker..."
+    echo 'Done.'
+    echo -n "Restoring ioBroker... "
      bash iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
-    echo "Done."
+    echo 'Done.'
    echo ' '
    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
    echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
-    echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
+    echo "!!!!!        The startup script restored iobroker from a backup file.        !!!!!"
    echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
    echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
    echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
@@ -168,11 +187,14 @@ then
 else
  echo "There is data detected in /opt/iobroker but it looks like it is no instance of ioBroker or a valid backup file!"
  echo "Please check/ recreate mounted folder or volume and start over."
+  if [[ "$debug" == "true" ]]; then
+    echo "[DEBUG] Detected files:"
+    ls -al
+  fi
  exit 1
 fi
 echo ' '

-
 #####
 # STEP 3 - Checking ioBroker-Installation
 #####
@@ -182,30 +204,49 @@ echo "$(printf -- '-%.0s' {1..80})"
 echo ' '

 # (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"
-echo "(Re)Setting folder permissions (This might take a while! Please be patient!)..."
+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.'
 echo ' '

 # Backing up original iobroker-file and changing sudo to gosu
-echo "Fixing \"sudo-bug\" by replacing sudo in iobroker with 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 'Done.'
 echo ' '

 # checking hostname in ioBroker to match container hostname
-if [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
-then
+if [[ "$(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')" != "$(hostname)" && "$multihost" != "slave" ]]; then
  echo "Hostname in ioBroker does not match the hostname of this container."
-  echo "Updating hostname to " $(hostname)"..."
-    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
-  echo "Done."
-  echo ' '
+  if [[ "$debug" == "true" ]]; then
+    echo "[DEBUG] Detected hostname in ioBroker: " $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    echo "[DEBUG] Detected hostname in container: " $(hostname)
+  fi
+  echo -n "Updating hostname to "$(hostname)"... "
+    bash iobroker host $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+  echo 'Done.'
+  echo ' '
+elif [[ "$multihost" == "slave" ]]; then
+  echo "IOB_MULTIHOST ist set to \"slave\". Hostname check will be skipped."
+  echo ' '
+elif [[ "$(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')" = "$(hostname)" && "$multihost" != "slave" ]]; then
+  echo "Hostname in ioBroker matches the hostname of this container."
+  if [[ "$debug" == "true" ]]; then
+    echo "[DEBUG] Detected hostname in ioBroker: " $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    echo "[DEBUG] Detected hostname in container: " $(hostname)
+  fi
+  echo "No action required."
+  echo ' '
+else
+  if [[ "$debug" == "true" ]]; then
+    echo "[DEBUG] There was a problem checking the hostname."
+    echo "[DEBUG] Detected hostname in ioBroker: " $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    echo "[DEBUG] Detected hostname in container: " $(hostname)
+  fi
 fi
-

 #####
 # STEP 4 - Setting up prerequisites for some ioBroker-adapters
@@ -216,243 +257,200 @@ echo "$(printf -- '-%.0s' {1..80})"
 echo ' '

 echo "Some adapters have special requirements/ settings which can be activated by the use of environment variables."
-echo "For more information take a look at readme.md on Github!"
+echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
 echo ' '

-
 # Checking ENV for Adminport
-if [ "$adminport" != "" ]
-then
-  if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
-  then
-    echo "Adminport set by ENV does not match port configured in ioBroker installation."
-    echo "Setting Adminport to \""$adminport"\"..."
+if [[ "$adminport" != "" ]]; then
+  if [[ "$adminport" != "$(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*')" ]]; then
+    echo "IOB_ADMINPORT is set and does not match port configured in ioBroker."
+    if [[ "$debug" == "true" ]]; then
+      echo "[DEBUG] Detected Admin Port in ioBroker: " $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*')
+    fi
+    echo -n "Setting Adminport to \""$adminport"\"... "
      bash iobroker set admin.0 --port $adminport
-    echo "Done."
+    echo 'Done.'
    echo ' '
  fi
 fi

-
 # Checking ENV for AVAHI
-if [ "$avahi" != "" ]
-then
-  if [ "$avahi" = "true" ]
-  then
-    echo "Avahi-daemon is activated by ENV."
+if [[ "$avahi" = "true" && "$offlinemode" = "true" ]]; then
+  echo 'AVAHI is \"true\", but OFFLINE_MODE is also \"true\". Skipping Avahi daemon setup.'
+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 'Done.'
  echo ' '
 fi
-fi
-

 # Checking ENV for Z-WAVE
-if [ "$zwave" != "" ]
-then
-  if [ "$zwave" = "true" ]
-  then
-    echo "Z-Wave is activated by ENV."
+if [[ "$zwave" = "true" && "$offlinemode" = "true" ]]; then
+  echo 'ZWAVE is \"true\", but OFFLINE_MODE is also \"true\". Skipping Z-Wave setup.'
+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 'Done.'    
  echo ' '
 fi
-fi
-

 # checking ENV for USBDEVICES
-if [ "$usbdevices" != "" ]
-then
-  if [ "$usbdevices" != "none" ]
-  then
-    echo "Usb-device-support is activated by ENV."
+if [[ "$usbdevices" != "" && "$usbdevices" != "none" ]]; then
+  echo 'USBDEVICES is set.'
  IFS=';' read -ra devicearray <<< "$usbdevices"
    for i in "${devicearray[@]}"
    do
-        echo "Setting permissions for" $i"..."
+      echo -n "Setting permissions for "$i"... "
        chown root:dialout $i
        chmod g+rw $i
+      echo 'Done.'
    done
-    echo "Done."
  echo ' '
 fi
-fi
-

 # Checking ENV for multihost setup
+if [[ "$multihost" != "" ]]; then
+  echo "Checking for multihost settings..."
  # Configuring objects db host
-if [ "$multihost" = "master" ] && [ "$objectsdbtype" = "" ] && [ "$objectsdbhost" = "" ] && [ "$objectsdbport" = "" ]
-then
-  echo "Multihost is set as \"master\" by ENV and no external objects db is set."
-  echo "Setting host of objects db to \"0.0.0.0\" to allow external communication..."
+  if [[ "$multihost" = "master" && "$objectsdbtype" = "" && "$objectsdbhost" = "" && "$objectsdbport" = "" ]]; then
+    echo "IOB_MULTIHOST is set to \"master\" and no external objects db is set."
+    echo -n "Setting host of objects db to \"0.0.0.0\" to allow external connections... "
      jq --arg objectsdbhost "0.0.0.0" '.objects.host = $objectsdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
-  echo "Done."
-  echo ' '
-elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
-then
-  echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too."
-  echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
-  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
+    echo 'Done.'
+  elif [[ "$multihost" = "master" && "$objectsdbhost" = "127.0.0.1" ]]; then
+    echo "IOB_MULTIHOST is set to \"master\", but IOB_OBJECTSDB_HOST is set to \"127.0.0.1\"."
+    echo "This configuration will not allow slaves to connect to objects db! Please change or remove \"IOB_OBJECTSDB_HOST\" and start over!"
+    echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
    exit 1
-elif [ "$multihost" = "master" ] &&  [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
-then
-  echo "Multihost is set as \"master\" by ENV and external objects db is set."
-  echo "Skipping this step..."
-  echo "Done."
-  echo ' '
-elif ([ "$multihost" = "slave" ] && [ "$objectsdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbport" = "" ])
-then
-  echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
-  echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db."
-  echo "Please check your settings and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
+  elif [[ "$multihost" = "master" && "$objectsdbtype" != "" && "$objectsdbhost" != "" && "$objectsdbport" != "" ]]; then
+    echo "IOB_MULTIHOST is set to \"master\" and external objects db is set."
+  elif ([[ "$multihost" = "slave" && "$objectsdbtype" = "" ]]) || ([[ "$multihost" = "slave" && "$objectsdbhost" = "" ]]) || ([[ "$multihost" = "slave" && "$objectsdbport" = "" ]]); then
+    echo "IOB_MULTIHOST is set to \"slave\", but no external objects db is set."
+    echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a master objects db."
+    echo "Please check your settings and start over!"
+    echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
    exit 1
-elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
-then
-  echo "Multihost is set as \"slave\" by ENV and external objects db is set."
-  echo "Skipping this step..."
-  echo "Done."
-  echo ' '
-elif [ "$multihost" != "" ]
-then
-  echo "Multihost is set but it seems like some configuration is missing."
+  elif [[ "$multihost" = "slave" && "$objectsdbtype" != "" && "$objectsdbhost" != "" && "$objectsdbport" != "" ]]; then
+    echo "IOB_MULTIHOST is set to \"slave\" and external objects db is set."
+  elif [[ "$multihost" != "" ]]; then
+    echo "IOB_MULTIHOST is set, but it seems like some configuration is missing."
    echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
+    echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
    exit 1
  fi
   # Configuring states db host
-if [ "$multihost" = "master" ] && [ "$statesdbtype" = "" ] && [ "$statesdbhost" = "" ] && [ "$statesdbport" = "" ]
-then
-  echo "Multihost is set as \"master\" by ENV and no external states db is set."
-  echo "Setting host of states db to \"0.0.0.0\" to allow external communication..."
+  if [[ "$multihost" = "master" && "$statesdbtype" = "" && "$statesdbhost" = "" && "$statesdbport" = "" ]]; then
+    echo "IOB_MULTIHOST is set to \"master\" and no external states db is set."
+    echo -n "Setting host of states db to \"0.0.0.0\" to allow external connections... "
      jq --arg statesdbhost "0.0.0.0" '.states.host = $statesdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
-  echo "Done."
-  echo ' '
-elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
-then
-  echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too."
-  echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
-  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
+    echo 'Done.'
+  elif [[ "$multihost" = "master" && "$statesdbhost" = "127.0.0.1" ]]; then
+    echo "IOB_MULTIHOST is set to \"master\", but states db host is set to \"127.0.0.1\"."
+    echo "This configuration will not allow slaves to connect to objects db! Please change or remove \"IOB_STATESDB_HOST\" and start over!"
+    echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
    exit 1
-elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
-then
-  echo "Multihost is set as \"master\" by ENV and external states db is set."
-  echo "Skipping this step..."
-  echo "Done."
-  echo ' '
-elif ([ "$multihost" = "slave" ] && [ "$statesdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbport" = "" ])
-then
-  echo "Multihost is set as \"slave\" by ENV. But no external states db is set."
+  elif [[ "$multihost" = "master" && "$statesdbtype" != "" && "$statesdbhost" != "" && "$statesdbport" != "" ]]; then
+    echo "IOB_MULTIHOST is set to \"master\" and external states db is set."
+  elif ([[ "$multihost" = "slave" && "$statesdbtype" = "" ]]) || ([[ "$multihost" = "slave" && "$statesdbhost" = "" ]]) || ([[ "$multihost" = "slave" && "$statesdbport" = "" ]]); then
+    echo "IOB_MULTIHOST is set to \"slave\", but no external states db is set."
    echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db."
-  echo "Please check your settings and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
+    echo "Please check your settings and start over!"
+    echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
    exit 1
-elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
-then
-  echo "Multihost is set as \"slave\" by ENV and external states db is set."
-  echo "Skipping this step..."
-  echo "Done."
-  echo ' '
-elif [ "$multihost" != "" ]
-then
-  echo "Multihost is set but it seems like some configuration is missing."
+  elif [[ "$multihost" = "slave" && "$statesdbtype" != "" && "$statesdbhost" != "" && "$statesdbport" != "" ]]; then
+    echo "IOB_MULTIHOST is set to \"slave\" and external states db is set."
+  elif [[ "$multihost" != "" ]]; then
+    echo "IOB_MULTIHOST is set, but it seems like some configuration is missing."
    echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
+    echo "For more information see ioBroker Docker image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
    exit 1
  fi
-
+  echo 'Done.'
+  echo ' '
+fi

 # Checking ENVs for custom setup of objects db
-if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
-then
-  if [ "$objectsdbtype" != $(jq -r '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
-  then
-    echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
-    echo "Setting type of objects db to \""$objectsdbtype"\"..."
+if [[ "$objectsdbtype" != "" || "$objectsdbhost" != "" || "$objectsdbport" != "" ]]; then
+  echo "Checking for custom objects db settings ..."
+  if [[ "$objectsdbtype" != "$(jq -r '.objects.type' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
+    echo "IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
+    echo -n "Setting type of objects db to \""$objectsdbtype"\"... "
      jq --arg objectsdbtype "$objectsdbtype" '.objects.type = $objectsdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
-    echo "Done."
+    echo 'Done.'
  else
-    echo "ENV IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
+    echo "IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation."
  fi
-  if [ "$objectsdbhost" != $(jq -r '.objects.host' /opt/iobroker/iobroker-data/iobroker.json) ]
-  then
-    echo "ENV IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
-    echo "Setting host of objects db to \""$objectsdbhost"\"..."
+  if [[ "$objectsdbhost" != "$(jq -r '.objects.host' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
+    echo "IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
+    echo -n "Setting host of objects db to \""$objectsdbhost"\"... "
      jq --arg objectsdbhost "$objectsdbhost" '.objects.host = $objectsdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
-    echo "Done."
+    echo 'Done.'
  else
-    echo "ENV IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
+    echo "IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation."
  fi
-  if [ "$objectsdbport" != $(jq -r '.objects.port' /opt/iobroker/iobroker-data/iobroker.json) ]
-  then
-    echo "ENV IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation."
-    echo "Setting port of objects db to \""$objectsdbport"\"..."
+  if [[ "$objectsdbport" != "$(jq -r '.objects.port' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
+    echo "IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation."
+    echo -n "Setting port of objects db to \""$objectsdbport"\"... "
      jq --arg objectsdbport $objectsdbport '.objects.port = $objectsdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
-    echo "Done."
+    echo 'Done.'
  else
-    echo "ENV IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
+    echo "IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation."
  fi
+  echo "Done."
  echo ' '
 fi

-
-# Checking ENVs for custom setup of states db#
-if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
-then
-  if [ "$statesdbtype" != $(jq -r '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ]
-  then
-    echo "ENV IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
-    echo "Setting type of states db to \""$statesdbtype"\"..."
+# Checking ENVs for custom setup of states db
+if [[ "$statesdbtype" != "" || "$statesdbhost" != "" || "$statesdbport" != "" ]]; then
+  echo "Checking for custom states db settings..."
+  if [[ "$statesdbtype" != "$(jq -r '.states.type' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
+    echo "IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
+    echo -n "Setting type of states db to \""$statesdbtype"\"... "
      jq --arg statesdbtype "$statesdbtype" '.states.type = $statesdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
-    echo "Done."
+    echo 'Done.'
  else
-    echo "ENV IOB_STATESDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
+    echo "IOB_STATESDB_TYPE is set and value meets detected ioBroker installation."
  fi
-  if [ "$statesdbhost" != $(jq -r '.states.host' /opt/iobroker/iobroker-data/iobroker.json) ]
-  then
-    echo "ENV IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
-    echo "Setting host of states db to \""$statesdbhost"\"..."
+  if [[ "$statesdbhost" != "$(jq -r '.states.host' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
+    echo "IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
+    echo -n "Setting host of states db to \""$statesdbhost"\"... "
      jq --arg statesdbhost "$statesdbhost" '.states.host = $statesdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
-    echo "Done."
+    echo 'Done.'
  else
-    echo "ENV IOB_STATESDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
+    echo "IOB_STATESDB_HOST is set and value meets detected ioBroker installation."
  fi
-  if [ "$statesdbport" != $(jq -r '.states.port' /opt/iobroker/iobroker-data/iobroker.json) ]
-  then
-    echo "ENV IOB_STATESDB_PORT is set and value is different from detected ioBroker installation."
-    echo "Setting port of states db to \""$statesdbport"\"..."
+  if [[ "$statesdbport" != "$(jq -r '.states.port' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
+    echo "IOB_STATESDB_PORT is set and value is different from detected ioBroker installation."
+    echo -n "Setting port of states db to \""$statesdbport"\"... "
      jq --arg statesdbport $statesdbport '.states.port = $statesdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
-    echo "Done."
+    echo 'Done.'
  else
-    echo "ENV IOB_STATESDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
+    echo "IOB_STATESDB_PORT is set and value meets detected ioBroker installation."
  fi
+  echo "Done."
  echo ' '
 fi

-
 # Checking for Userscripts in /opt/userscripts
-if [ `find /opt/userscripts -type f | wc -l` -lt 1 ]
-then
-  echo "There is no data detected in /opt/userscripts. Restoring exapmple userscripts..."
+if [[ `find /opt/userscripts -type f | wc -l` -lt 1 ]]; then
+  echo -n "There is no data detected in /opt/userscripts. Restoring exapmple userscripts... "
    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.'
  echo ' '
-elif [ -f /opt/userscripts/userscript_firststart.sh ] || [ -f /opt/userscripts/userscript_everystart.sh ]
-then
-  if [ -f /opt/userscripts/userscript_firststart.sh ] && [ -f /opt/.firstrun ]
-  then
+elif [[ -f /opt/userscripts/userscript_firststart.sh || -f /opt/userscripts/userscript_everystart.sh ]]; then
+  if [[ -f /opt/userscripts/userscript_firststart.sh && -f /opt/.firstrun ]]; 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
@@ -460,8 +458,7 @@ then
    echo "Done."
    echo ' '
  fi
-  if [ -f /opt/userscripts/userscript_everystart.sh ]
-  then
+  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
@@ -471,8 +468,7 @@ then
 fi

 # Removing first run marker when exists
-if [ -f /opt/.firstrun ]
-then
+if [[ -f /opt/.firstrun ]]; then
  rm -f /opt/.firstrun
 fi

@@ -485,6 +481,7 @@ echo "$(printf -- '-%.0s' {1..80})"
 echo ' '
 echo "Starting ioBroker..."
 echo ' '
+echo "##### #### ### ## # iobroker.js-controller log output # ## ### #### #####"

 # Setting healthcheck status to "running"
 echo "running" > /opt/scripts/.docker_config/.healthcheck
@@ -494,8 +491,34 @@ shut_down() {
  echo ' '
  echo "Recived termination signal (SIGTERM)."
  echo "Shutting down ioBroker..."
-  pid=$(ps -ef | awk '/[j]s.controller/{print $2}')
-  kill -SIGTERM "$pid"
+
+  local status timeout
+
+  timeout="$(date --date="now + $pkill_timeout sec" +%s)"
+  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
+    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...'
+      pkill --signal SIGKILL -u iobroker
+      echo 'Done. Have a nice day!'
+      exit
+    fi
+
+    echo -n '.'
+    sleep 1
+  done
+
+  echo -e '\nDone. Have a nice day!'
  exit
 }

--- a/debian/scripts/maintenance.sh
+++ b/debian/scripts/maintenance.sh
@@ -1,231 +1,262 @@
-#!/bin/bash
+#!/usr/bin/env bash

-############################
-##### default settings #####
-############################
+# bash strict mode
+set -euo pipefail

-autoconfirm=no              # could be set to true by commandline option
-killbyname=no               # could be set to true by commandline option / undocumented, only for use with backitup restore scripts
-
-####################################
-##### declaration of functions #####
-####################################
+autoconfirm=      # can be set to 'yes' by command line option
+killbyname=       # can be set to 'yes' by command line option (undocumented, only for use with backitup restore scripts)
+healthcheck=/opt/scripts/.docker_config/.healthcheck      # path of healthcheck file
+pkill_timeout=10      # timeout for stopping iobroker in seconds

 # display help text
 display_help() {
-  echo "This script is build to manage your ioBroker container!"
+  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 shuts down or restarts container"
-  echo "       upgrade    > will put container to maintenance mode and upgrade ioBroker"
-  echo "       help       > shows this help"
+  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 '       help       > shows this help'
  echo ''
-  echo "OPTIONS"
-  echo "------------------"
-  echo "       -y|--yes   > confirms the used command without asking"
-  echo "       -h|--help  > shows this help"
+  echo 'OPTIONS'
+  echo '------------------'
+  echo '       -y|--yes   > confirms the used command without asking'
+  echo '       -h|--help  > shows this help'
  echo ''
-  exit 0
 }

-# checking maintenance mode status
-check_status() {
-  if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
-  then
+# check maintenance enabled
+maintenance_enabled() {
+  [[ -f "$healthcheck" && "$(cat "$healthcheck")" == maintenance ]]
+}
+
+# display maintenance status
+maintenance_status() {
+  if maintenance_enabled; then
    echo 'Maintenance mode is turned ON.'
-  elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
-  then
+  else
    echo 'Maintenance mode is turned OFF.'
  fi
 }

-# turn maintenance mode ON
-switch_on() {
-  if [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ] && [ "$killbyname" == "yes" ] # maintenance mode OFF / killbyname = yes  / undocumented, only for use with backitup restore scripts
-  then
-    echo 'This command will activate maintenance mode and stop all node processes.'
-    echo 'Activating maintenance mode...'
-    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
-    sleep 1
-    echo 'Done.'
-    echo 'Stopping ioBroker...'
-    pkill node
-    sleep 1
-    echo 'Done.'
-    exit 0
-  elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ] && [ "$autoconfirm" == "no" ] # maintenance mode OFF / autoconfirm = no
-  then
-    echo 'You are now going to stop ioBroker and activating maintenance mode for this container.'
-    read -p 'Do you want to continue [yes/no]? ' A
-    if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
-    then
-      echo 'Activating maintenance mode...'
-      echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
-      sleep 1
-      echo 'Done.'
-      echo 'Stopping ioBroker...'
-      pkill -u iobroker
-      sleep 1
-      echo 'Done.'
-      exit 0
-    else
-    exit 0
-    fi
-  elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ] && [ "$autoconfirm" == "yes" ] # maintenance mode OFF / autoconfirm = yes
-  then
-    echo 'You are now going to stop ioBroker and activating maintenance mode for this container.'
-    echo 'This command was already confirmed by -y or --yes option.'
-    echo 'Activating maintenance mode...'
-    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
-    sleep 1
-    echo 'Done.'
-    echo 'Stopping ioBroker...'
-    pkill -u iobroker
-    sleep 1
-    echo 'Done.'
-    exit 0
-  else
+# enable maintenance mode
+enable_maintenance() {
+  if maintenance_enabled; then
    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.'
+
+  if [[ "$autoconfirm" != yes ]]; then
+    local reply
+
+    read -rp 'Do you want to continue [yes/no]? ' reply
+    if [[ "$reply" == y || "$reply" == Y || "$reply" == yes ]]; then
+      : # continue
+    else
+      return 1
+    fi
+  else
+    echo 'This command was already confirmed by the -y or --yes option.'
+  fi
+
+  echo 'Activating maintenance mode...'
+  echo 'maintenance' > "$healthcheck"
+  sleep 1
+  echo 'Done.'
+  echo -n 'Stopping ioBroker...'
+  stop_iob
 }

-# turn maintenance mode OFF
-switch_off() {
-  if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ] && [ "$autoconfirm" == "no" ] # maintenance mode ON / autoconfirm = no
-  then
-    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.'
-    read -p 'Do you want to continue [yes/no]? ' A
-    if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
-    then
-      echo 'Deactivating maintenance mode and forcing container to stop or restart...'
-      echo "stopping" > /opt/scripts/.docker_config/.healthcheck
-      pkill -u root
-      echo 'Done.'
-      exit 0
-    else
-      exit 0
-    fi
-  elif [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ] && [ "$autoconfirm" == "yes" ] # maintenance mode ON / autoconfirm = yes
-  then
-    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 'This command was already confirmed by -y or --yes option.'
-    echo 'Deactivating maintenance mode and forcing container to stop or restart...'
-    echo "stopping" > /opt/scripts/.docker_config/.healthcheck
-    pkill -u root
-    echo 'Done.'
-    exit 0
-  else
+# disable maintenance mode
+disable_maintenance() {
+  if ! maintenance_enabled; then
    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.'
+
+  if [[ "$autoconfirm" != yes ]]; then
+    local reply
+
+    read -rp 'Do you want to continue [yes/no]? ' reply
+    if [[ "$reply" == y || "$reply" == Y || "$reply" == yes ]]; then
+      : # continue
+    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.'
 }

 # upgrade js-controller
-upgrade() {
+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 of the restart policy, your container will be stopped or restarted automatically after the upgrade.'
+  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" == "no" ]
-  then
-    read -p 'Do you want to continue [yes/no]? ' A
-    if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
-    then
-      : # Continue.
+  if [[ "$autoconfirm" != yes ]]; then
+    local reply
+
+    read -rp 'Do you want to continue [yes/no]? ' reply
+    if [[ "$reply" == y || "$reply" == Y || "$reply" == yes ]]; then
+      : # continue
    else
-      exit 0
+      return 1
    fi
-  elif [ "$autoconfirm" == "yes" ]
-  then
-    echo 'This command was already confirmed by -y or --yes option.'
+  else
+    echo 'This command was already confirmed by the -y or --yes option.'
+  fi
+
+  if ! maintenance_enabled > /dev/null; then
+    autoconfirm=yes
+    enable_maintenance
  fi

-  echo 'Activating maintenance mode...'
-  echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
-  sleep 1
-  echo 'Done.'
-  echo 'Stopping ioBroker...'
-  pkill -u iobroker
-  sleep 1
-  echo 'Done.'
  echo 'Upgrading js-controller...'
  iobroker update
+  sleep 1
  iobroker upgrade self
  sleep 1
  echo 'Done.'
+
  echo 'Container will be stopped or restarted in 5 seconds...'
  sleep 5
-  echo "stopping" > /opt/scripts/.docker_config/.healthcheck
+  echo 'stopping' > "$healthcheck"
  pkill -u root
-  exit 0
 }

-########################################
-##### parsing commands and options #####
-########################################
+# 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.'

-# reading all arguments and putting them in reverse
-reverse=
-for i in "$@"; do
-  reverse="$i $reverse"
+  if [[ "$autoconfirm" != yes ]]; then
+    local reply
+
+    read -rp 'Do you want to continue [yes/no]? ' reply
+    if [[ "$reply" == y || "$reply" == Y || "$reply" == yes ]]; then
+      : # continue
+    else
+      return 1
+    fi
+  else
+    echo 'This command was already confirmed by the -y or --yes option.'
+  fi
+
+  echo -n 'Stopping ioBroker...'
+  stop_iob
+
+  echo 'Container will be stopped or restarted in 5 seconds...'
+  sleep 5
+  echo 'stopping' > "$healthcheck"
+  pkill -u root
+}
+
+# stop iobroker and wait until all processes stopped or pkill_timeout is reached
+stop_iob() {
+  local status timeout
+
+  timeout="$(date --date="now + $pkill_timeout sec" +%s)"
+  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
+    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
+
+    echo -n '.'
+    sleep 1
  done

-# checking the arguments
-for i in $reverse; do
-  case $i in
+  echo -e '\nDone.'
+}
+
+# parsing commands and options
+
+# default command to run unless another was given
+run=(display_help)
+
+for arg in "$@"; do
+  case $arg in
    help|-h|--help)
-      display_help        # calling function to display help text
-      break
+      run=(display_help)
      ;;
    status)
-      check_status        # calling function to check maintenance mode status
-      break
+      run=(maintenance_status)
      ;;
    on)
-      switch_on           # calling function to switch maintenance mode on
-      break
+      run=(enable_maintenance)
      ;;
    off)
-      switch_off          # calling function to switch maintenance mode off
-      break
+      run=(disable_maintenance)
      ;;
    upgrade)
-      upgrade             # calling function to upgrade js-controller
-      break
+      run=(upgrade_jscontroller)
+      ;;
+    restart)
+      run=(restart_container)
      ;;
    -y|--yes)
-      autoconfirm=yes     # setting autoconfrm option to "yes"
-      shift
+      autoconfirm=yes
      ;;
    -kbn|--killbyname)
-      killbyname=yes     # setting killbyname option to "yes"
-      shift
+      killbyname=yes
      ;;
-    -a=*|--argument=*)    # dummy exaple for parsing option with value
-      ARGUMENT="${i#*=}"
-      shift
-      ;;
-    --)                   # End of all options.
-      shift
+    --)
      break
      ;;
-    -?*|?*)
-      echo 'WARN: Unknown parameter. Please try again or see help (-h|--help).'
-      break
-      ;;
-    *)                    # Default case: No more options, so break out of the loop.
-      break
+    *)
+      >&2 echo "Unknown parameter: $arg"
+      >&2 echo 'Please try again or see help (help|-h|--help).'
+      exit 1
      ;;
  esac
 done

-exit 0
+"${run[@]}"
--- a/debian/scripts/setup_avahi.sh
+++ b/debian/scripts/setup_avahi.sh
@@ -1,19 +1,20 @@
 #!/bin/bash

-echo "Checking avahi-daemon installation state..."
-
 if [ -e /usr/sbin/avahi-daemon ] && [ -e /var/run/dbus ]
 then
-  echo "Avahi is already installed..."
+  echo '[setup_avahi.sh] Avahi is already installed. Nothing to do here.'
 else
-  echo "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
    rm -rf /var/lib/apt/lists/* >> /opt/scripts/avahi_startup.log 2>&1
-  echo "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 "Configuring dbus..."
+  echo 'Done.'
+  echo -n '[setup_avahi.sh] Configuring dbus... '
    mkdir /var/run/dbus/
+  echo 'Done.'
 fi

 if [ -f /var/run/dbus/pid ];
@@ -26,10 +27,12 @@ then
  rm -f /var/run/avahi-daemon//pid
 fi

-echo "Starting dbus..."
-dbus-daemon --system
+echo -n '[setup_avahi.sh] Starting dbus... '
+  dbus-daemon --system >> /opt/scripts/avahi_startup.log 2>&1
+echo 'Done.'

-echo "Starting avahi-daemon..."
-/etc/init.d/avahi-daemon start
+echo -n '[setup_avahi.sh] Starting avahi-daemon... '
+  /etc/init.d/avahi-daemon start >> /opt/scripts/avahi_startup.log 2>&1
+echo 'Done.'

 exit 0
--- a/debian/scripts/setup_packages.sh
+++ b/debian/scripts/setup_packages.sh
@@ -23,13 +23,8 @@ else
  exit 1
 fi

-# Cleanup
-apt-get autoclean -y
-apt-get autoremove
-apt-get clean
-rm -rf /tmp/* /var/tmp/*
-rm -rf /root/.cache/*
-rm -rf /var/lib/apt/lists/*
-rm -f /opt/scripts/.docker_config/.packages
+# 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

 exit 0
--- a/debian/scripts/setup_zwave.sh
+++ b/debian/scripts/setup_zwave.sh
@@ -1,19 +1,17 @@
 #!/bin/bash

-echo "Checking openzwave installation state..."
-
 if [ -e /usr/local/lib64 ]
 then
-  echo "Openzwave is already installed..."
+  echo '[setup_zwave.sh] Openzwave is already installed. Nothing to do here.'
 else
-  echo "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
    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
-  # echo "Openzwave is now installed..."
+  echo 'Done.'
 fi

 exit 0
--- a/docs/README_docker_hub_buanet.md
+++ b/docs/README_docker_hub_buanet.md
@@ -1,4 +1,4 @@
-<img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/iobroker_logo.png" width="600" title="ioBroker Logo">
+<img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/iobroker_logo.png" width="600" title="ioBroker Logo">

 [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/r/buanet/iobroker)
 [![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/r/buanet/iobroker)
@@ -26,10 +26,15 @@ New major image versions (e.g. v4, v5, v6) always come with a new major version

 # Supported tags

-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-vX` tag instead.
+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[X]` tag instead.
+
+### Node 16 versions
+* [`v7.0.1`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile)
+* [`v7.0.0`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile)

 ### Node 14 versions
-* [`v6.0.0`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile)
+* [`v6.1.0`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile)
+* [`v6.0.0`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile)

 ### Node 12 versions
 * [`v5.2.0`](https://github.com/buanet/ioBroker.docker/blob/v5.2.0/debian/node12/Dockerfile), [`v5.2.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v5.2.0/debian/node12/Dockerfile), [`v5.2.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v5.2.0/debian/node12/Dockerfile), [`v5.2.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v5.2.0/debian/node12/Dockerfile), [`latest-v5`](https://github.com/buanet/ioBroker.docker/blob/v5.2.0/debian/node12/Dockerfile)
@@ -93,10 +98,10 @@ You could use environment variables to auto configure your ioBroker container on
 * `IOB_MULTIHOST`(optional) Sets ioBroker "master" or "slave" for multihost support (needs additional config for objectsdb and statesdb!)
 * `IOB_OBJECTSDB_HOST` (optional, default: 127.0.0.1) Sets host for ioBroker objects db
 * `IOB_OBJECTSDB_PORT` (optional, default: 9001) Sets port for ioBroker objects db
-* `IOB_OBJECTSDB_TYPE` (optional, default: file) Sets type of ioBroker objects db, could be "file" or "redis" ([not officially supported](https://github.com/ioBroker/ioBroker#databases)).
+* `IOB_OBJECTSDB_TYPE` (optional, default: jsonl) Sets type of ioBroker objects db, could be "jsonl", "file" (deprecated) or "redis" ([not officially supported](https://github.com/ioBroker/ioBroker#databases)).
 * `IOB_STATESDB_HOST` (optional, default: 127.0.0.1) Sets host for ioBroker states db
 * `IOB_STATESDB_PORT` (optional, default: 9000) Sets port for ioBroker states db
-* `IOB_STATESDB_TYPE` (optional, default: file) Sets type of ioBroker states db, could be "file" or "redis"
+* `IOB_STATESDB_TYPE` (optional, default: jsonl) Sets type of ioBroker states db, could be "jsonl", "file" (deprecated) or "redis"

 ### Activate special features: 

@@ -105,12 +110,14 @@ You could use environment variables to auto configure your ioBroker container on

 ### Configure environment:

+* `DEBUG` (optional, default: false) Set true to get extended logging messages on container startup
 * `LANG` (optional, default: de_DE.UTF&#x2011;8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8
 * `LANGUAGE` (optional, default: de_DE:de) The following locales are pre-generated: de_DE:de, en_US:en
 * `LC_ALL` (optional, default: de_DE.UTF-8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8
+* `OFFLINE_MODE` (optional & experimental, default: false) Set true if you container has no or limited internet connection
 * `PACKAGES` (optional) Installs additional linux packages to your container, packages should be separated by whitespace like this: "package1 package2 package3".
-* `SETGID` (optional, default: 1000) In some cases it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host
-* `SETUID` (optional, default: 1000) In some cases it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host
+* `SETGID` (default: 1000) In some cases it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host
+* `SETUID` (default: 1000) In some cases it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host
 * `TZ` (optional, default: Europe/Berlin) Specifies the time zone
 * `USBDEVICES` (optional) Sets relevant permissions on mounted devices like "/dev/ttyACM0". For more than one device separate with ";".

--- a/docs/README_docker_hub_iobroker.md
+++ b/docs/README_docker_hub_iobroker.md
@@ -1,6 +1,6 @@
 ###### [iobroker/iobroker](https://hub.docker.com/r/iobroker/iobroker) is an alias for [buanet/iobroker](https://hub.docker.com/r/buanet/iobroker) 
 
-<img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/iobroker_logo.png" width="600" title="ioBroker Logo">
+<img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/iobroker_logo.png" width="600" title="ioBroker Logo">

 [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/r/buanet/iobroker)
 [![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/r/buanet/iobroker)
@@ -27,10 +27,15 @@ New major image versions (e.g. v4, v5, v6) always come with a new major version

 # Supported tags

-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-vX` tag instead.
+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[X]` tag instead.
+
+### Node 16 versions
+* [`v7.0.1`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile)
+* [`v7.0.0`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile)

 ### Node 14 versions
-* [`v6.0.0`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile)
+* [`v6.1.0`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile)
+* [`v6.0.0`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile)

 ### Node 12 versions
 * [`v5.2.0`](https://github.com/buanet/ioBroker.docker/blob/v5.2.0/debian/node12/Dockerfile), [`v5.2.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v5.2.0/debian/node12/Dockerfile), [`v5.2.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v5.2.0/debian/node12/Dockerfile), [`v5.2.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v5.2.0/debian/node12/Dockerfile), [`latest-v5`](https://github.com/buanet/ioBroker.docker/blob/v5.2.0/debian/node12/Dockerfile)
@@ -94,10 +99,10 @@ You could use environment variables to auto configure your ioBroker container on
 * `IOB_MULTIHOST`(optional) Sets ioBroker "master" or "slave" for multihost support (needs additional config for objectsdb and statesdb!)
 * `IOB_OBJECTSDB_HOST` (optional, default: 127.0.0.1) Sets host for ioBroker objects db
 * `IOB_OBJECTSDB_PORT` (optional, default: 9001) Sets port for ioBroker objects db
-* `IOB_OBJECTSDB_TYPE` (optional, default: file) Sets type of ioBroker objects db, could be "file" or "redis" ([not officially supported](https://github.com/ioBroker/ioBroker#databases)).
+* `IOB_OBJECTSDB_TYPE` (optional, default: jsonl) Sets type of ioBroker objects db, could be "jsonl", "file" (deprecated) or "redis" ([not officially supported](https://github.com/ioBroker/ioBroker#databases)).
 * `IOB_STATESDB_HOST` (optional, default: 127.0.0.1) Sets host for ioBroker states db
 * `IOB_STATESDB_PORT` (optional, default: 9000) Sets port for ioBroker states db
-* `IOB_STATESDB_TYPE` (optional, default: file) Sets type of ioBroker states db, could be "file" or "redis"
+* `IOB_STATESDB_TYPE` (optional, default: jsonl) Sets type of ioBroker states db, could be "jsonl", "file" (deprecated) or "redis"

 ### Activate special features: 

@@ -106,12 +111,14 @@ You could use environment variables to auto configure your ioBroker container on

 ### Configure environment:

+* `DEBUG` (optional, default: false) Set true to get extended logging messages on container startup
 * `LANG` (optional, default: de_DE.UTF&#x2011;8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8
 * `LANGUAGE` (optional, default: de_DE:de) The following locales are pre-generated: de_DE:de, en_US:en
 * `LC_ALL` (optional, default: de_DE.UTF-8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8
+* `OFFLINE_MODE` (optional & experimental, default: false) Set true if you container has no or limited internet connection
 * `PACKAGES` (optional) Installs additional linux packages to your container, packages should be separated by whitespace like this: "package1 package2 package3".
-* `SETGID` (optional, default: 1000) In some cases it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host
-* `SETUID` (optional, default: 1000) In some cases it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host
+* `SETGID` (default: 1000) In some cases it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host
+* `SETUID` (default: 1000) In some cases it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host
 * `TZ` (optional, default: Europe/Berlin) Specifies the time zone
 * `USBDEVICES` (optional) Sets relevant permissions on mounted devices like "/dev/ttyACM0". For more than one device separate with ";".

--- a/docs/img/iobroker_logo.png
+++ b/docs/img/iobroker_logo.png
--- a/docs/img/iobroker_logo_small.png
+++ b/docs/img/iobroker_logo_small.png
--- a/docs/img/pp_logo.png
+++ b/docs/img/pp_logo.png