diff --git a/root/etc/cont-init.d/99-custom-files b/root/etc/cont-init.d/99-custom-files
index 61a310f..aff7240 100644
--- a/root/etc/cont-init.d/99-custom-files
+++ b/root/etc/cont-init.d/99-custom-files
@@ -4,42 +4,49 @@
 SCRIPTS_DIR="/config/custom-cont-init.d"
 SERVICES_DIR="/config/custom-services.d"
 
-# Make sure custom directories exist and have files in them
+# Make sure custom init directory exists and has files in it
 if ([ -e "${SCRIPTS_DIR}" ] && \
-   [ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" ]) || \
-   ([ -e "${SERVICES_DIR}" ] && \
-   [ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]); then
-    if [ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" ]; then
-      echo "[custom-init] files found in ${SCRIPTS_DIR} executing"
-      for SCRIPT in ${SCRIPTS_DIR}/*; do
-        NAME="$(basename "${SCRIPT}")"
-        if [ -f "${SCRIPT}" ]; then
-          echo "[custom-init] ${NAME}: executing..."
-          /bin/bash ${SCRIPT}
-          echo "[custom-init] ${NAME}: exited $?"
-        elif [ ! -f "${SCRIPT}" ]; then
-          echo "[custom-init] ${NAME}: is not a file"
-        fi
-      done
-    fi
-    if [ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]; then
-      echo "[custom-init] service files found in ${SERVICES_DIR} copying"
-      for SERVICE in ${SERVICES_DIR}/*; do
-        NAME="$(basename "${SERVICE}")"
-        if ! $(cmp -s ${SERVICE} /etc/services.d/${NAME}/run) && \
-           [ -f "${SERVICE}" ]; then
-          echo "[custom-init] ${NAME}: new file detected copying..."
-          mkdir -p /etc/services.d/${NAME}/
-          cp ${SERVICE} /etc/services.d/${NAME}/run
-          chmod +x /etc/services.d/${NAME}/run
-          echo "[custom-init] ${NAME}: copied"
-        elif [ ! -f "${SERVICE}" ]; then
-          echo "[custom-init] ${NAME}: is not a file"
-        else
-          echo "[custom-init] ${NAME}: is up to date"
-        fi
-      done
-    fi
+   [ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" ]); then
+    echo "[custom-init] files found in ${SCRIPTS_DIR} executing"
+    for SCRIPT in ${SCRIPTS_DIR}/*; do
+      NAME="$(basename "${SCRIPT}")"
+      if [ -f "${SCRIPT}" ]; then
+        echo "[custom-init] ${NAME}: executing..."
+        /bin/bash ${SCRIPT}
+        echo "[custom-init] ${NAME}: exited $?"
+      elif [ ! -f "${SCRIPT}" ]; then
+        echo "[custom-init] ${NAME}: is not a file"
+      fi
+    done
 else
-    echo "[custom-init] no custom files found exiting..."
+    echo "[custom-init] no custom init files found"
 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/services.d/custom-service-* 2>/dev/null)" ]; then
+  echo "[custom-init] removing existing custom services..."
+  rm -rf /etc/services.d/custom-service-*
+fi
+
+# Make sure custom services directory exists and has files in it
+if [ -e "${SERVICES_DIR}" ] && \
+   [ -n "$(/bin/ls -A ${SERVICES_DIR} 2>/dev/null)" ]; then
+    echo "[custom-init] service files found in ${SERVICES_DIR}"
+    for SERVICE in ${SERVICES_DIR}/*; do
+      NAME="$(basename "${SERVICE}")"
+      if [ -f "${SERVICE}" ]; then
+        echo "[custom-init] ${NAME}: service detected, copying..."
+        mkdir -p /etc/services.d/custom-service-${NAME}/
+        cp ${SERVICE} /etc/services.d/custom-service-${NAME}/run
+        chmod +x /etc/services.d/custom-service-${NAME}/run
+        echo "[custom-init] ${NAME}: copied"
+      elif [ ! -f "${SERVICE}" ]; then
+        echo "[custom-init] ${NAME}: is not a file"
+      fi
+    done
+else
+    echo "[custom-init] no custom services files found"
+fi
+
+echo "[custom-init] done"