diff --git a/.templates/01-custom_script.sh b/.templates/01-custom_script.sh
index 4a5e5afa5..1ceb81034 100755
--- a/.templates/01-custom_script.sh
+++ b/.templates/01-custom_script.sh
@@ -2,12 +2,20 @@
 # shellcheck shell=bash
 
 slug="${HOSTNAME#*-}"
-bashio::log.info "Execute /config/${slug}.sh if existing"
+bashio::log.info "Execute /config/addons_autoscripts/${slug}.sh if existing"
 
+mkdir -p /config/addons_autoscripts
+
+# Migrate scripts
 if [ -f /config/"${slug}".sh ]; then
+  mv -f /config/"${slug}".sh /config/addons_autoscripts/"${slug}".sh
+fi
+
+# Execute scripts
+if [ -f /config/addons_autoscripts/"${slug}".sh ]; then
     bashio::log.info "... script found, executing"
-    chmod +x /config/"${slug}".sh
-    /./config/"${slug}".sh
+    chmod +x /config/addons_autoscripts/"${slug}".sh
+    /./config/addons_autoscripts/"${slug}".sh
 else
     bashio::log.info "... no script found"
 fi