diff --git a/root/docker-mods b/root/docker-mods
index 660b8ad..3949e99 100755
--- a/root/docker-mods
+++ b/root/docker-mods
@@ -136,10 +136,6 @@ set_legacy_executable_bits
 SERVICES_DIR_OLD="/config/custom-services.d"
 SERVICES_DIR="/custom-services.d"
 
-if [ -e "${SERVICES_DIR_OLD}" ]; then
-    chown -R 0:0 "${SERVICES_DIR_OLD}"
-fi
-
 # Remove all existing custom services before continuing to ensure
 # we aren't running anything the user may have removed
 if [ -n "$(/bin/ls -A /etc/s6-overlay/s6-rc.d/custom-svc-* 2>/dev/null)" ]; then
@@ -147,6 +143,20 @@ if [ -n "$(/bin/ls -A /etc/s6-overlay/s6-rc.d/custom-svc-* 2>/dev/null)" ]; then
     rm -rf /etc/s6-overlay/s6-rc.d/custom-svc-*
 fi
 
+# Tamper check services
+if ([ -d "/config/custom-services.d" ] && [ -n "$(find /config/custom-services.d ! -user root)" ]); then
+    echo "**** Potential tampering with custom scripts detected ****"
+    randstr=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-8};echo;)
+    mv "/config/custom-services.d" "/config/custom-services.d.${randstr}"
+    echo "**** Folder /config/custom-services.d is moved to /config/custom-services.d.${randstr} ****"
+    echo "**** The folder '/config/custom-services.d' and its contents need to all be owned by root to prevent root escalation inside the container!!! ****"
+    mkdir -p /config/custom-services.d
+    chown 0:0 /config/custom-services.d
+elif ([ -d "/config/custom-services.d" ] && [ -n "$(find /config/custom-services.d -perm -o+w)" ]); then
+    echo "**** The folder '/config/custom-services.d' or some of its contents have write permissions for others, which is a security risk. ****"
+    echo "**** Please review the permissions of this folder and its contents to make sure they are owned by root, and can only be modified by root. ****"
+fi
+
 if { [ -z "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]; } && \
     { [ -z "$(/bin/ls -A ${SERVICES_DIR_OLD} 2>/dev/null)" ]; }; then    
     echo "[custom-init] no custom files found, exiting..."
diff --git a/root/etc/s6-overlay/s6-rc.d/init-tamper-check/run b/root/etc/s6-overlay/s6-rc.d/init-tamper-check/run
index 6699a27..04aec81 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-tamper-check/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-tamper-check/run
@@ -1,18 +1,14 @@
 #!/usr/bin/with-contenv bash
 
-if ([ -d "/config/custom-cont-init.d" ] && [ -n "$(find /config/custom-cont-init.d ! -user root)" ]) || ([ -d "/config/custom-services.d" ] && [ -n "$(find /config/custom-services.d ! -user root)" ]); then
-    echo "**** Potential tampering with custom scripts/services detected ****"
+if ([ -d "/config/custom-cont-init.d" ] && [ -n "$(find /config/custom-cont-init.d ! -user root)" ]); then
+    echo "**** Potential tampering with custom scripts detected ****"
     randstr=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-8};echo;)
-    for folder in "/config/custom-cont-init.d" "/config/custom-services.d"; do
-        if [ -d "${folder}" ]; then
-            mv "${folder}" "${folder}.${randstr}"
-            echo "**** Folder ${folder} is moved to ${folder}.${randstr} ****"
-        fi
-    done
-    echo "**** The folders '/config/custom-cont-init.d' and '/config/custom-services.d'; and their contents need to all be owned by root to prevent root escalation inside the container!!! ****"
-    mkdir -p /config/custom-cont-init.d /config/custom-services.d
-    chown 0:0 /config/custom-cont-init.d /config/custom-services.d
-elif ([ -d "/config/custom-cont-init.d" ] && [ -n "$(find /config/custom-cont-init.d -perm -o+w)" ]) || ([ -d "/config/custom-services.d" ] && [ -n "$(find /config/custom-services.d -perm -o+w)" ]); then
-    echo "**** The folders '/config/custom-cont-init.d' or '/config/custom-services.d'; or some of their contents have write permissions for others, which is a security risk. ****"
-    echo "**** Please review the permissions of these two folders and their contents to make sure they are owned by root, and can only be modified by root. ****"
+    mv "/config/custom-cont-init.d" "/config/custom-cont-init.d.${randstr}"
+    echo "**** Folder /config/custom-cont-init.d is moved to /config/custom-cont-init.d.${randstr} ****"
+    echo "**** The folder '/config/custom-cont-init.d' and its contents need to all be owned by root to prevent root escalation inside the container!!! ****"
+    mkdir -p /config/custom-cont-init.d
+    chown 0:0 /config/custom-cont-init.d
+elif ([ -d "/config/custom-cont-init.d" ] && [ -n "$(find /config/custom-cont-init.d -perm -o+w)" ]); then
+    echo "**** The folder '/config/custom-cont-init.d' or some of its contents have write permissions for others, which is a security risk. ****"
+    echo "**** Please review the permissions of this folder and its contents to make sure they are owned by root, and can only be modified by root. ****"
 fi