diff --git a/ct/headers/netboot-xyz b/ct/headers/netboot.xyz
similarity index 100%
rename from ct/headers/netboot-xyz
rename to ct/headers/netboot.xyz
diff --git a/ct/headers/netvisor b/ct/headers/netvisor
deleted file mode 100644
index e7bc6fe14e3..00000000000
--- a/ct/headers/netvisor
+++ /dev/null
@@ -1,6 +0,0 @@
-   _____                                   
-  / ___/_________ _____  ____  ____  __  __
-  \__ \/ ___/ __ `/ __ \/ __ \/ __ \/ / / /
- ___/ / /__/ /_/ / / / / /_/ / /_/ / /_/ / 
-/____/\___/\__,_/_/ /_/\____/ .___/\__, /  
-                           /_/    /____/   
diff --git a/tools/headers/add-netbird-lxc b/tools/headers/add-netbird-lxc
new file mode 100644
index 00000000000..cec4ea62661
--- /dev/null
+++ b/tools/headers/add-netbird-lxc
@@ -0,0 +1,6 @@
+             __    __                 __  __    _          __      __         
+  ____ _____/ /___/ /     ____  ___  / /_/ /_  (_)________/ /     / /  _______
+ / __ `/ __  / __  /_____/ __ \/ _ \/ __/ __ \/ / ___/ __  /_____/ / |/_/ ___/
+/ /_/ / /_/ / /_/ /_____/ / / /  __/ /_/ /_/ / / /  / /_/ /_____/ />  </ /__  
+\__,_/\__,_/\__,_/     /_/ /_/\___/\__/_.___/_/_/   \__,_/     /_/_/|_|\___/  
+                                                                              
diff --git a/tools/headers/add-tailscale-lxc b/tools/headers/add-tailscale-lxc
new file mode 100644
index 00000000000..3bdb2143b1f
--- /dev/null
+++ b/tools/headers/add-tailscale-lxc
@@ -0,0 +1,6 @@
+             __    __      __        _ __                __           __         
+  ____ _____/ /___/ /     / /_____ _(_) /_____________ _/ /__        / /  _______
+ / __ `/ __  / __  /_____/ __/ __ `/ / / ___/ ___/ __ `/ / _ \______/ / |/_/ ___/
+/ /_/ / /_/ / /_/ /_____/ /_/ /_/ / / (__  ) /__/ /_/ / /  __/_____/ />  </ /__  
+\__,_/\__,_/\__,_/      \__/\__,_/_/_/____/\___/\__,_/_/\___/     /_/_/|_|\___/  
+                                                                                 
diff --git a/tools/headers/all-templates b/tools/headers/all-templates
new file mode 100644
index 00000000000..7c8214370a1
--- /dev/null
+++ b/tools/headers/all-templates
@@ -0,0 +1,6 @@
+         ____      __                       __      __           
+  ____ _/ / /     / /____  ____ ___  ____  / /___ _/ /____  _____
+ / __ `/ / /_____/ __/ _ \/ __ `__ \/ __ \/ / __ `/ __/ _ \/ ___/
+/ /_/ / / /_____/ /_/  __/ / / / / / /_/ / / /_/ / /_/  __(__  ) 
+\__,_/_/_/      \__/\___/_/ /_/ /_/ .___/_/\__,_/\__/\___/____/  
+                                 /_/                             
diff --git a/tools/headers/coder-code-server b/tools/headers/codercodeserver
similarity index 100%
rename from tools/headers/coder-code-server
rename to tools/headers/codercodeserver
diff --git a/tools/headers/filebrowser-quantum b/tools/headers/filebrowserquantum
similarity index 100%
rename from tools/headers/filebrowser-quantum
rename to tools/headers/filebrowserquantum
diff --git a/tools/headers/container-restore-from-backup b/tools/headers/homeassistantcontainer
similarity index 100%
rename from tools/headers/container-restore-from-backup
rename to tools/headers/homeassistantcontainer
diff --git a/tools/headers/core-restore-from-backup b/tools/headers/homeassistantcore
similarity index 100%
rename from tools/headers/core-restore-from-backup
rename to tools/headers/homeassistantcore
diff --git a/tools/headers/immich-public-proxy b/tools/headers/immichpublicproxy
similarity index 100%
rename from tools/headers/immich-public-proxy
rename to tools/headers/immichpublicproxy
diff --git a/tools/headers/add-iptag b/tools/headers/ip-tag
similarity index 100%
rename from tools/headers/add-iptag
rename to tools/headers/ip-tag
diff --git a/tools/headers/netdata b/tools/headers/netdata
new file mode 100644
index 00000000000..ad7dc923430
--- /dev/null
+++ b/tools/headers/netdata
@@ -0,0 +1,6 @@
+    _   __     __      __      __       
+   / | / /__  / /_____/ /___ _/ /_____ _
+  /  |/ / _ \/ __/ __  / __ `/ __/ __ `/
+ / /|  /  __/ /_/ /_/ / /_/ / /_/ /_/ / 
+/_/ |_/\___/\__/\__,_/\__,_/\__/\__,_/  
+                                        
diff --git a/tools/headers/pyenv b/tools/headers/pyenv
new file mode 100644
index 00000000000..a70ad94be78
--- /dev/null
+++ b/tools/headers/pyenv
@@ -0,0 +1,6 @@
+                                
+    ____  __  _____  ____ _   __
+   / __ \/ / / / _ \/ __ \ | / /
+  / /_/ / /_/ /  __/ / / / |/ / 
+ / .___/\__, /\___/_/ /_/|___/  
+/_/    /____/                   
diff --git a/tools/headers/webmin b/tools/headers/webmin
new file mode 100644
index 00000000000..f2306990f87
--- /dev/null
+++ b/tools/headers/webmin
@@ -0,0 +1,6 @@
+ _       __     __              _     
+| |     / /__  / /_  ____ ___  (_)___ 
+| | /| / / _ \/ __ \/ __ `__ \/ / __ \
+| |/ |/ /  __/ /_/ / / / / / / / / / /
+|__/|__/\___/_.___/_/ /_/ /_/_/_/ /_/ 
+                                      
diff --git a/vm/headers/docker-vm b/vm/headers/docker
similarity index 100%
rename from vm/headers/docker-vm
rename to vm/headers/docker
diff --git a/vm/headers/owncloud-vm b/vm/headers/turnkeyowncloudvm
similarity index 100%
rename from vm/headers/owncloud-vm
rename to vm/headers/turnkeyowncloudvm