diff --git a/.templates/00-banner.sh b/.templates/00-banner.sh
index 5ecba7c1f..ab9b37769 100755
--- a/.templates/00-banner.sh
+++ b/.templates/00-banner.sh
@@ -17,8 +17,8 @@ if ! bashio::supervisor.ping 2>/dev/null; then
     bashio::log.blue "Config source: ENV + /data/options.json"
     bashio::log.blue '-----------------------------------------------------------'
     cp -rf /usr/local/lib/bashio-standalone.sh /usr/bin/bashio
-    grep -rlZ "^#!.*bashio" /etc |
-    while IFS= read -r -d '' f; do
+    grep -rl "^#!.*bashio" /etc |
+    while IFS= read -r f; do
         grep -qF "source /usr/local/lib/bashio-standalone.sh" "$f" && continue
         sed -i '1a source /usr/local/lib/bashio-standalone.sh' "$f"
     done
diff --git a/maintainerr/rootfs/ha_entrypoint.sh b/maintainerr/rootfs/ha_entrypoint.sh
index 95b2b361f..b252544c8 100755
--- a/maintainerr/rootfs/ha_entrypoint.sh
+++ b/maintainerr/rootfs/ha_entrypoint.sh
@@ -21,7 +21,8 @@ if [ -d /etc/cont-init.d ]; then
         # Source the script so it inherits bashio functions from bashio-standalone.
         # Using bash "$script" would spawn a new process without bashio:: functions,
         # causing "command not found" failures under set -e.
-        bash "$script"
+        # shellcheck disable=SC1090
+        source "$script"
     done
 fi