diff --git a/scripts/headscale/tailscale/tailscale.sh b/containers/headscale/resources/tailscale.sh
similarity index 100%
rename from scripts/headscale/tailscale/tailscale.sh
rename to containers/headscale/resources/tailscale.sh
diff --git a/scripts/headscale/remote/headscale_check_remote.sh b/containers/headscale/scripts/headscale_check_remote.sh
similarity index 100%
rename from scripts/headscale/remote/headscale_check_remote.sh
rename to containers/headscale/scripts/headscale_check_remote.sh
diff --git a/scripts/headscale/headscale_commands.sh b/containers/headscale/scripts/headscale_commands.sh
similarity index 100%
rename from scripts/headscale/headscale_commands.sh
rename to containers/headscale/scripts/headscale_commands.sh
diff --git a/scripts/headscale/headscale_edit_config.sh b/containers/headscale/scripts/headscale_edit_config.sh
similarity index 100%
rename from scripts/headscale/headscale_edit_config.sh
rename to containers/headscale/scripts/headscale_edit_config.sh
diff --git a/scripts/headscale/local/headscale_generate_auth.sh b/containers/headscale/scripts/headscale_generate_auth.sh
similarity index 100%
rename from scripts/headscale/local/headscale_generate_auth.sh
rename to containers/headscale/scripts/headscale_generate_auth.sh
diff --git a/scripts/headscale/local/headscale_get_hostname.sh b/containers/headscale/scripts/headscale_get_hostname.sh
similarity index 100%
rename from scripts/headscale/local/headscale_get_hostname.sh
rename to containers/headscale/scripts/headscale_get_hostname.sh
diff --git a/scripts/headscale/headscale_setup.sh b/containers/headscale/scripts/headscale_setup.sh
similarity index 100%
rename from scripts/headscale/headscale_setup.sh
rename to containers/headscale/scripts/headscale_setup.sh
diff --git a/scripts/headscale/local/headscale_setup_local.sh b/containers/headscale/scripts/headscale_setup_local.sh
similarity index 100%
rename from scripts/headscale/local/headscale_setup_local.sh
rename to containers/headscale/scripts/headscale_setup_local.sh
diff --git a/scripts/headscale/local/headscale_setup_localhost.sh b/containers/headscale/scripts/headscale_setup_localhost.sh
similarity index 100%
rename from scripts/headscale/local/headscale_setup_localhost.sh
rename to containers/headscale/scripts/headscale_setup_localhost.sh
diff --git a/scripts/headscale/remote/headscale_setup_remote.sh b/containers/headscale/scripts/headscale_setup_remote.sh
similarity index 100%
rename from scripts/headscale/remote/headscale_setup_remote.sh
rename to containers/headscale/scripts/headscale_setup_remote.sh
diff --git a/scripts/headscale/headscale_user.sh b/containers/headscale/scripts/headscale_user.sh
similarity index 100%
rename from scripts/headscale/headscale_user.sh
rename to containers/headscale/scripts/headscale_user.sh
diff --git a/scripts/headscale/tailscale/tailscale_install.sh b/containers/headscale/scripts/tailscale_install.sh
similarity index 56%
rename from scripts/headscale/tailscale/tailscale_install.sh
rename to containers/headscale/scripts/tailscale_install.sh
index 06c39e8..7d2c0fd 100755
--- a/scripts/headscale/tailscale/tailscale_install.sh
+++ b/containers/headscale/scripts/tailscale_install.sh
@@ -8,13 +8,11 @@ tailscaleInstallToContainer()
     local result=$(createFolders "loud" $docker_install_user $containers_dir$app_name/tailscale)
     checkSuccess "Creating Tailscale folder"
 
-    copyFile "loud" "${install_scripts_dir}tailscale.sh" "$containers_dir$app_name/tailscale/tailscale.sh" $docker_install_user | runInstallWrite -a "$logs_dir/$docker_log_file" 2>&1
+    copyFile "loud" "${install_containers_dir}headscale/resources/tailscale.sh" "$containers_dir$app_name/tailscale/tailscale.sh" $docker_install_user | runInstallWrite -a "$logs_dir/$docker_log_file" 2>&1
 
     if [[ "$type" != "install" ]]; then
         dockerComposeRestart $app_name;
     fi
-    #dockerCommandRun "docker cp ${install_scripts_dir}tailscale.sh $app_name:/usr/local/bin/tailscale.sh"
-    #checkSuccess "Installing Tailscale installer script into the $app_name container"
 
     dockerCommandRun "docker exec -it $app_name /usr/local/bin/tailscale.sh"
     checkSuccess "Executing Tailscale installer script in the $app_name container"
diff --git a/scripts/source/files/arrays/files_headscale.sh b/scripts/source/files/arrays/files_headscale.sh
deleted file mode 100755
index 0b44a2b..0000000
--- a/scripts/source/files/arrays/files_headscale.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# This file is auto-generated by generate_arrays.sh
-# Do not edit manually - run './scripts/source/files/generate_arrays.sh run' to regenerate
-
-headscale_scripts=(
-    "headscale/headscale_commands.sh"
-    "headscale/headscale_edit_config.sh"
-    "headscale/headscale_setup.sh"
-    "headscale/headscale_user.sh"
-    "headscale/local/headscale_generate_auth.sh"
-    "headscale/local/headscale_get_hostname.sh"
-    "headscale/local/headscale_setup_localhost.sh"
-    "headscale/local/headscale_setup_local.sh"
-    "headscale/remote/headscale_check_remote.sh"
-    "headscale/remote/headscale_setup_remote.sh"
-    "headscale/tailscale/tailscale_install.sh"
-
-)
diff --git a/scripts/source/files/arrays/files_source.sh b/scripts/source/files/arrays/files_source.sh
index 3af26c4..97734ee 100755
--- a/scripts/source/files/arrays/files_source.sh
+++ b/scripts/source/files/arrays/files_source.sh
@@ -14,7 +14,6 @@ source_scripts=(
     "source/files/arrays/files_database.sh"
     "source/files/arrays/files_docker.sh"
     "source/files/arrays/files_function.sh"
-    "source/files/arrays/files_headscale.sh"
     "source/files/arrays/files_install.sh"
     "source/files/arrays/files_logs.sh"
     "source/files/arrays/files_menu.sh"
diff --git a/scripts/source/files/generate_arrays.sh b/scripts/source/files/generate_arrays.sh
index 9f05125..7143d57 100755
--- a/scripts/source/files/generate_arrays.sh
+++ b/scripts/source/files/generate_arrays.sh
@@ -111,15 +111,6 @@ EOF
                 esac
             fi
             
-            # Skip specific files for headscale folder
-            if [ "$folder_name" = "headscale" ]; then
-                case "$rel_path" in
-                    "headscale/tailscale/tailscale.sh")
-                        continue
-                        ;;
-                esac
-            fi
-            
             # Escape quotes and add to array
             echo "    \"$rel_path\"" >> "$array_file"
         done