diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index 86b270d14..3d063407a 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -33,13 +33,10 @@ RUN \
     && sed '11,13d' /defaults/qBittorrent.conf \ 
     && echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \
     && echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf
-    # use /data instead of /config for hass.io environment
-    # &&  files=$(grep -rls '/config' /) && echo $files | xargs sed -i "s=/config=/data=g" \
+# use /data instead of /config for hass.io environment
+# &&  files=$(grep -rls '/config' /) && echo $files | xargs sed -i "s=/config=/data=g" \
 
 # Copy root filesystem
 COPY rootfs /
 
-# Allow custom scripts execution
-RUN chmod -R 755 /scripts/
-
 VOLUME [ "/data" ]
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index 9ce34d4a7..8fbebfe18 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -6,7 +6,9 @@ RUN \
     # Allow UID and GID setting
     sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
-    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
-    && sed -i -e '$a\scrutiny-collector-metrics run' /etc/cont-init.d/50-config
+    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
+
+# Copy root filesystem
+COPY rootfs /
 
 VOLUME [ "/data" ]
\ No newline at end of file
diff --git a/scrutiny/config.json b/scrutiny/config.json
index 88a5d3f77..3aaaa1c6b 100644
--- a/scrutiny/config.json
+++ b/scrutiny/config.json
@@ -40,4 +40,4 @@
     "PGID": "int",
     "TZ": "str?"
   }
-}
+}
\ No newline at end of file
diff --git a/scrutiny/rootfs/etc/services.d/script/run b/scrutiny/rootfs/etc/services.d/script/run
new file mode 100644
index 000000000..102451923
--- /dev/null
+++ b/scrutiny/rootfs/etc/services.d/script/run
@@ -0,0 +1,14 @@
+#!/bin/bash
+port="8080"
+host="localhost"
+timeout="30"
+timeout_argument=""
+
+if timeout -t 1337 true >/dev/null 2>&1; then
+    timeout_argument="-t"
+fi
+
+timeout ${timeout_argument} "${timeout}" \
+bash -c \
+"until echo > /dev/tcp/${host}/${port} ; do sleep 0.5; done" \
+>/dev/null 2>&1 && scrutiny-collector-metrics run || echo "port $port is not available"