diff --git a/.templates/00-smb_mounts.sh b/.templates/00-smb_mounts.sh
index 6279ab1a035..c5c2cc49a54 100755
--- a/.templates/00-smb_mounts.sh
+++ b/.templates/00-smb_mounts.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=
+set -e
 
 ####################
 # MOUNT SMB SHARES #
diff --git a/.templates/90-config_yaml.sh b/.templates/90-config_yaml.sh
index 3f0d57c53ec..1a3be6c5b28 100755
--- a/.templates/90-config_yaml.sh
+++ b/.templates/90-config_yaml.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2155,SC1087,SC2163,SC2116,SC2086
+set -e
 
 ##################
 # INITIALIZATION #
diff --git a/calibre/rootfs/etc/cont-init.d/20-folders.sh b/calibre/rootfs/etc/cont-init.d/20-folders.sh
index 3c5ee72db4a..8cb7637b8d5 100755
--- a/calibre/rootfs/etc/cont-init.d/20-folders.sh
+++ b/calibre/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2046
+set -e
 
 # Define user
 PUID=$(bashio::config "PUID")
diff --git a/calibre/rootfs/etc/cont-init.d/80-configuration.sh b/calibre/rootfs/etc/cont-init.d/80-configuration.sh
index c88298e5696..d4ae3b2eb45 100755
--- a/calibre/rootfs/etc/cont-init.d/80-configuration.sh
+++ b/calibre/rootfs/etc/cont-init.d/80-configuration.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2015
+set -e
 
 # Install specific apps
 if bashio::config.has_value 'additional_apps'; then
diff --git a/calibre_web/rootfs/etc/cont-init.d/80-configuration.sh b/calibre_web/rootfs/etc/cont-init.d/80-configuration.sh
index 1392f047f4e..971f25c3ea6 100755
--- a/calibre_web/rootfs/etc/cont-init.d/80-configuration.sh
+++ b/calibre_web/rootfs/etc/cont-init.d/80-configuration.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2015
+set -e
 
 # Set TZ
 if bashio::config.has_value 'TZ'; then
diff --git a/enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh b/enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
index f3a36adc300..617bff405dc 100755
--- a/enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
+++ b/enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2155
+set -e
 
 #####################
 # Autodiscover mqtt #
diff --git a/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh b/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
index f3a36adc300..617bff405dc 100755
--- a/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
+++ b/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2155
+set -e
 
 #####################
 # Autodiscover mqtt #
diff --git a/immich/rootfs/etc/cont-init.d/99-run.sh b/immich/rootfs/etc/cont-init.d/99-run.sh
index 2bc9b1122d3..f62b8bb5920 100755
--- a/immich/rootfs/etc/cont-init.d/99-run.sh
+++ b/immich/rootfs/etc/cont-init.d/99-run.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2155,SC2016
+set -e
 
 ###################################
 # Export all addon options as env #
diff --git a/joplin/rootfs/etc/cont-init.d/99-run.sh b/joplin/rootfs/etc/cont-init.d/99-run.sh
index 6b3566ecb3b..5c7ff8eef5b 100755
--- a/joplin/rootfs/etc/cont-init.d/99-run.sh
+++ b/joplin/rootfs/etc/cont-init.d/99-run.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2155
+set -e
 
 bashio::log.warning "Warning - minimum configuration recommended : 2 cpu cores and 4 GB of memory. Otherwise the system will become unresponsive and crash."
 
diff --git a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh
index 3d2c80fe8a7..bed4d4ec935 100755
--- a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2086
+set -e
 
 # Runs only after initialization done
 # shellcheck disable=SC2128
diff --git a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
index 856d35d33ea..a2503272796 100755
--- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
+++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2155
+set -e
 
 ####################
 # Define variables #
diff --git a/photoprism/rootfs/etc/cont-init.d/30-graphic_drivers.sh b/photoprism/rootfs/etc/cont-init.d/30-graphic_drivers.sh
index a604832d2d2..b38e5966463 100755
--- a/photoprism/rootfs/etc/cont-init.d/30-graphic_drivers.sh
+++ b/photoprism/rootfs/etc/cont-init.d/30-graphic_drivers.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2015
+set -e
 
 if bashio::config.has_value 'graphic_drivers'; then
     GRAPHIC_DRIVERS="$(bashio::config 'graphic_drivers')"
diff --git a/photoprism/rootfs/run.sh b/photoprism/rootfs/run.sh
index 83da9d74e73..5441c9158c7 100755
--- a/photoprism/rootfs/run.sh
+++ b/photoprism/rootfs/run.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2155,SC2015
+set -e
 
 ###########
 # SCRIPTS #
diff --git a/sabnzbd/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/sabnzbd/rootfs/etc/cont-init.d/32-nginx_ingress.sh
index 6bc6cc18a58..7d8665c9811 100755
--- a/sabnzbd/rootfs/etc/cont-init.d/32-nginx_ingress.sh
+++ b/sabnzbd/rootfs/etc/cont-init.d/32-nginx_ingress.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2317
+set -e
 
 #################
 # NGINX SETTING #
diff --git a/seafile/rootfs/etc/cont-init.d/99-run.sh b/seafile/rootfs/etc/cont-init.d/99-run.sh
index c127f234558..d8c8a1d2d21 100755
--- a/seafile/rootfs/etc/cont-init.d/99-run.sh
+++ b/seafile/rootfs/etc/cont-init.d/99-run.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2155,SC2016
+set -e
 
 ###################################
 # Export all addon options as env #
diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh
index df70979cb02..a19fb05e8cc 100755
--- a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh
+++ b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2155
+set -e
 
 #####################
 # Export env values #
diff --git a/webtop_kde/rootfs/etc/cont-init.d/20-folders.sh b/webtop_kde/rootfs/etc/cont-init.d/20-folders.sh
index b1c45c08c98..f74fe4c97f9 100755
--- a/webtop_kde/rootfs/etc/cont-init.d/20-folders.sh
+++ b/webtop_kde/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2046
+set -e
 
 # Define user
 PUID=$(bashio::config "PUID")
diff --git a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh
index 6847b03cc36..a84504ce86f 100755
--- a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh
+++ b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2015
+set -e
 
 # Install specific apps
 if bashio::config.has_value 'additional_apps'; then
diff --git a/webtrees/rootfs/etc/cont-init.d/99-run.sh b/webtrees/rootfs/etc/cont-init.d/99-run.sh
index b949beb5010..3c961b5da02 100755
--- a/webtrees/rootfs/etc/cont-init.d/99-run.sh
+++ b/webtrees/rootfs/etc/cont-init.d/99-run.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bashio
 # shellcheck shell=bash
-set -e
 # shellcheck disable=SC2155
+set -e
 
 ##############
 # CLOUDFLARE #