diff --git a/cloudcommander/rootfs/00-banner.sh b/cloudcommander/rootfs/00-banner.sh
new file mode 100644
index 000000000..52d8a7e60
--- /dev/null
+++ b/cloudcommander/rootfs/00-banner.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: Base Images
+# Displays a simple add-on banner on startup
+# ==============================================================================
+if bashio::supervisor.ping; then
+    bashio::log.blue \
+        '-----------------------------------------------------------'
+    bashio::log.blue " Add-on: $(bashio::addon.name)"
+    bashio::log.blue " $(bashio::addon.description)"
+    bashio::log.blue \
+        '-----------------------------------------------------------'
+
+    bashio::log.blue " Add-on version: $(bashio::addon.version)"
+    if bashio::var.true "$(bashio::addon.update_available)"; then
+        bashio::log.magenta ' There is an update available for this add-on!'
+        bashio::log.magenta \
+            " Latest add-on version: $(bashio::addon.version_latest)"
+        bashio::log.magenta ' Please consider upgrading as soon as possible.'
+    else
+        bashio::log.green ' You are running the latest version of this add-on.'
+    fi
+
+    bashio::log.blue " System: $(bashio::info.operating_system)" \
+        " ($(bashio::info.arch) / $(bashio::info.machine))"
+    bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
+    bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
+
+    bashio::log.blue \
+        '-----------------------------------------------------------'
+    bashio::log.blue \
+        ' Please, share the above information when looking for help'
+    bashio::log.blue \
+        ' or support in, e.g., GitHub, forums or the Discord chat.'
+    bashio::log.green \
+        ' https://github.com/alexbelgium/hassio-addons'
+    bashio::log.blue \
+        '-----------------------------------------------------------'
+fi
diff --git a/cloudcommander/rootfs/run.sh b/cloudcommander/rootfs/run.sh
index 297b498c9..49c5b7239 100644
--- a/cloudcommander/rootfs/run.sh
+++ b/cloudcommander/rootfs/run.sh
@@ -1,61 +1,15 @@
 #!/usr/bin/env bashio
 
-##########
-# BANNER #
-##########
+###########
+# SCRIPTS #
+###########
 
-if bashio::supervisor.ping; then
-  bashio::log.blue \
-  '-----------------------------------------------------------'
-  bashio::log.blue " Add-on: $(bashio::addon.name)"
-  bashio::log.blue " $(bashio::addon.description)"
-  bashio::log.blue \
-  '-----------------------------------------------------------'
-
-  bashio::log.blue " Add-on version: $(bashio::addon.version)"
-  if bashio::var.true "$(bashio::addon.update_available)"; then
-    bashio::log.magenta ' There is an update available for this add-on!'
-    bashio::log.magenta \
-    " Latest add-on version: $(bashio::addon.version_latest)"
-    bashio::log.magenta ' Please consider upgrading as soon as possible.'
-  else
-    bashio::log.green ' You are running the latest version of this add-on.'
-  fi
-
-  bashio::log.blue " System: $(bashio::info.operating_system)" \
-  " ($(bashio::info.arch) / $(bashio::info.machine))"
-  bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
-  bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
-
-  bashio::log.blue \
-  '-----------------------------------------------------------'
-  bashio::log.blue \
-  ' Please, share the above information when looking for help'
-  bashio::log.blue \
-  ' or support in, e.g., GitHub, forums or the Discord chat.'
-  bashio::log.green \
-  ' https://github.com/alexbelgium/hassio-addons'
-  bashio::log.blue \
-  '-----------------------------------------------------------'
-fi
-
-######################
-# MOUNT LOCAL SCRIPT #
-######################
-chown $(id -u):$(id -g) /92-local_mounts.sh
-chmod a+x /92-local_mounts.sh
-sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-local_mounts.sh
-/./92-local_mounts.sh &
-true # Prevents script crash on failure
-
-######################
-# EXECUTE SMB SCRIPT #
-######################
-chown $(id -u):$(id -g) /92-smb_mounts.sh
-chmod a+x /92-smb_mounts.sh
-sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-smb_mounts.sh
-/./92-smb_mounts.sh &
-true # Prevents script crash on failure
+for SCRIPTS in "00-banner.sh" "92-local_mounts.sh" "92-smb_mounts.sh"
+  chown $(id -u):$(id -g) /$SCRIPTS
+  chmod a+x /$SCRIPTS
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /$SCRIPTS
+  /./$SCRIPTS & true # Prevents script crash on failure
+done
 
 #################
 # NGINX SETTING #
diff --git a/filebrowser/rootfs/00-banner.sh b/filebrowser/rootfs/00-banner.sh
new file mode 100644
index 000000000..71b1a4e4e
--- /dev/null
+++ b/filebrowser/rootfs/00-banner.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: Base Images
+# Displays a simple add-on banner on startup
+# ==============================================================================
+if bashio::supervisor.ping; then
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+    bashio::log.blue " Add-on: $(bashio::addon.name)"
+    bashio::log.blue " $(bashio::addon.description)"
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+
+    bashio::log.blue " Add-on version: $(bashio::addon.version)"
+    if bashio::var.true "$(bashio::addon.update_available)"; then
+        bashio::log.magenta ' There is an update available for this add-on!'
+        bashio::log.magenta \
+        " Latest add-on version: $(bashio::addon.version_latest)"
+        bashio::log.magenta ' Please consider upgrading as soon as possible.'
+    else
+        bashio::log.green ' You are running the latest version of this add-on.'
+    fi
+
+    bashio::log.blue " System: $(bashio::info.operating_system)" \
+    " ($(bashio::info.arch) / $(bashio::info.machine))"
+    bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
+    bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
+
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+    bashio::log.blue \
+    ' Please, share the above information when looking for help'
+    bashio::log.blue \
+    ' or support in, e.g., GitHub, forums or the Discord chat.'
+    bashio::log.green \
+    ' https://github.com/alexbelgium/hassio-addons'
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+fi
diff --git a/filebrowser/rootfs/run.sh b/filebrowser/rootfs/run.sh
index 99dd76a3a..f2ae6c337 100644
--- a/filebrowser/rootfs/run.sh
+++ b/filebrowser/rootfs/run.sh
@@ -1,61 +1,15 @@
 #!/usr/bin/env bashio
 
-##########
-# BANNER #
-##########
+###########
+# SCRIPTS #
+###########
 
-if bashio::supervisor.ping; then
-  bashio::log.blue \
-    '-----------------------------------------------------------'
-  bashio::log.blue " Add-on: $(bashio::addon.name)"
-  bashio::log.blue " $(bashio::addon.description)"
-  bashio::log.blue \
-    '-----------------------------------------------------------'
-
-  bashio::log.blue " Add-on version: $(bashio::addon.version)"
-  if bashio::var.true "$(bashio::addon.update_available)"; then
-    bashio::log.magenta ' There is an update available for this add-on!'
-    bashio::log.magenta \
-      " Latest add-on version: $(bashio::addon.version_latest)"
-    bashio::log.magenta ' Please consider upgrading as soon as possible.'
-  else
-    bashio::log.green ' You are running the latest version of this add-on.'
-  fi
-
-  bashio::log.blue " System: $(bashio::info.operating_system)" \
-    " ($(bashio::info.arch) / $(bashio::info.machine))"
-  bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
-  bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
-
-  bashio::log.blue \
-    '-----------------------------------------------------------'
-  bashio::log.blue \
-    ' Please, share the above information when looking for help'
-  bashio::log.blue \
-    ' or support in, e.g., GitHub, forums or the Discord chat.'
-  bashio::log.green \
-    ' https://github.com/alexbelgium/hassio-addons'
-  bashio::log.blue \
-    '-----------------------------------------------------------'
-fi
-
-######################
-# MOUNT LOCAL SCRIPT #
-######################
-chown $(id -u):$(id -g) /92-local_mounts.sh
-chmod a+x /92-local_mounts.sh
-sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-local_mounts.sh
-/./92-local_mounts.sh &
-true # Prevents script crash on failure
-
-######################
-# EXECUTE SMB SCRIPT #
-######################
-chown $(id -u):$(id -g) /92-smb_mounts.sh
-chmod a+x /92-smb_mounts.sh
-sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-smb_mounts.sh
-/./92-smb_mounts.sh &
-true # Prevents script crash on failure
+for SCRIPTS in "00-banner.sh" "92-local_mounts.sh" "92-smb_mounts.sh"
+  chown $(id -u):$(id -g) /$SCRIPTS
+  chmod a+x /$SCRIPTS
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /$SCRIPTS
+  /./$SCRIPTS & true # Prevents script crash on failure
+done
 
 ###################
 # SSL CONFIG v1.0 #
diff --git a/photoprism/rootfs/00-banner.sh b/photoprism/rootfs/00-banner.sh
new file mode 100644
index 000000000..71b1a4e4e
--- /dev/null
+++ b/photoprism/rootfs/00-banner.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Home Assistant Community Add-on: Base Images
+# Displays a simple add-on banner on startup
+# ==============================================================================
+if bashio::supervisor.ping; then
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+    bashio::log.blue " Add-on: $(bashio::addon.name)"
+    bashio::log.blue " $(bashio::addon.description)"
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+
+    bashio::log.blue " Add-on version: $(bashio::addon.version)"
+    if bashio::var.true "$(bashio::addon.update_available)"; then
+        bashio::log.magenta ' There is an update available for this add-on!'
+        bashio::log.magenta \
+        " Latest add-on version: $(bashio::addon.version_latest)"
+        bashio::log.magenta ' Please consider upgrading as soon as possible.'
+    else
+        bashio::log.green ' You are running the latest version of this add-on.'
+    fi
+
+    bashio::log.blue " System: $(bashio::info.operating_system)" \
+    " ($(bashio::info.arch) / $(bashio::info.machine))"
+    bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
+    bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
+
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+    bashio::log.blue \
+    ' Please, share the above information when looking for help'
+    bashio::log.blue \
+    ' or support in, e.g., GitHub, forums or the Discord chat.'
+    bashio::log.green \
+    ' https://github.com/alexbelgium/hassio-addons'
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+fi
diff --git a/photoprism/rootfs/run.sh b/photoprism/rootfs/run.sh
index a4c0674bf..dac43c6d2 100644
--- a/photoprism/rootfs/run.sh
+++ b/photoprism/rootfs/run.sh
@@ -2,62 +2,16 @@
 
 bashio::log.warning "Warning - minimum configuration recommended : 2 cpu cores and 4 GB of memory"
 
-##########
-# BANNER #
-##########
+###########
+# SCRIPTS #
+###########
 
-if bashio::supervisor.ping; then
-  bashio::log.blue \
-    '-----------------------------------------------------------'
-  bashio::log.blue " Add-on: $(bashio::addon.name)"
-  bashio::log.blue " $(bashio::addon.description)"
-  bashio::log.blue \
-    '-----------------------------------------------------------'
-
-  bashio::log.blue " Add-on version: $(bashio::addon.version)"
-  if bashio::var.true "$(bashio::addon.update_available)"; then
-    bashio::log.magenta ' There is an update available for this add-on!'
-    bashio::log.magenta \
-      " Latest add-on version: $(bashio::addon.version_latest)"
-    bashio::log.magenta ' Please consider upgrading as soon as possible.'
-  else
-    bashio::log.green ' You are running the latest version of this add-on.'
-  fi
-
-  bashio::log.blue " System: $(bashio::info.operating_system)" \
-    " ($(bashio::info.arch) / $(bashio::info.machine))"
-  bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
-  bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
-
-  bashio::log.blue \
-    '-----------------------------------------------------------'
-  bashio::log.blue \
-    ' Please, share the above information when looking for help'
-  bashio::log.blue \
-    ' or support in, e.g., GitHub, forums or the Discord chat.'
-  bashio::log.green \
-    ' https://github.com/alexbelgium/hassio-addons'
-  bashio::log.blue \
-    '-----------------------------------------------------------'
-fi
-
-######################
-# MOUNT LOCAL SCRIPT #
-######################
-chown $(id -u):$(id -g) /92-local_mounts.sh
-chmod a+x /92-local_mounts.sh
-sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-local_mounts.sh
-/./92-local_mounts.sh &
-true # Prevents script crash on failure
-
-######################
-# EXECUTE SMB SCRIPT #
-######################
-chown $(id -u):$(id -g) /92-smb_mounts.sh
-chmod a+x /92-smb_mounts.sh
-sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /92-smb_mounts.sh
-/./92-smb_mounts.sh &
-true # Prevents script crash on failure
+for SCRIPTS in "00-banner.sh" "92-local_mounts.sh" "92-smb_mounts.sh"
+  chown $(id -u):$(id -g) /$SCRIPTS
+  chmod a+x /$SCRIPTS
+  sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' /$SCRIPTS
+  /./$SCRIPTS & true # Prevents script crash on failure
+done
 
 ##############
 # LAUNCH APP #