diff --git a/root/etc/cont-init.d/99-custom-scripts b/root/etc/cont-init.d/99-custom-scripts
index 7e4c16b..cfde313 100644
--- a/root/etc/cont-init.d/99-custom-scripts
+++ b/root/etc/cont-init.d/99-custom-scripts
@@ -1,15 +1,50 @@
 #!/usr/bin/with-contenv bash
 
-# Make sure custom script directory exists and has files in it
-SCRIPTS_DIR="/config/custom-init-scripts"
-if [ -e "${SCRIPTS_DIR}" ] && \
-   [ -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
-        echo "[custom-init] ${SCRIPT}: executing..."
-        /bin/bash ${SCRIPT}
-        echo "[custom-init] ${SCRIPT}: exited $?"
-    done
-else
-    echo "[custom-init] no custom scripts found exiting..."
+# Directories
+SCRIPTS_DIR="/config/custom-cont-init.d"
+SERVICES_DIR="/config/custom-services.d"
+
+# 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 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}"
+      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
+    fi
+  fi
+else
+  echo "[custom-init] no custom files found exiting..."
 fi