diff --git a/templates/deprecated/cyberchef.xml b/templates/deprecated/cyberchef.xml
new file mode 100644
index 0000000..ad50d40
--- /dev/null
+++ b/templates/deprecated/cyberchef.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<Container version="2">
+  <Name>cyberchef</Name>
+  <Repository>mpepping/cyberchef:latest</Repository>
+  <Registry>https://hub.docker.com/r/mpepping/cyberchef/</Registry>
+  <Network>bridge</Network>
+  <Shell>sh</Shell>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/89502-support-a75g-repo/</Support>
+  <Project>https://github.com/mpepping/docker-cyberchef/</Project>
+  <Overview>The Cyber Swiss Army Knife - a web app for encryption, encoding, compression and data analysis.</Overview>
+  <Category>Productivity: Tools: Status:Stable</Category>
+  <WebUI>http://[IP]:[PORT:8000]</WebUI>
+  <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/cyberchef.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/cyberchef.png</Icon>
+  <Description>The Cyber Swiss Army Knife - a web app for encryption, encoding, compression and data analysis.</Description>
+  <Labels/>
+  <Config Name="Port" Target="8000" Default="8000" Mode="tcp" Description="Port" Type="Port" Display="always" Required="false" Mask="false">8000</Config>
+</Container>
diff --git a/templates/dashmachine.xml b/templates/deprecated/dashmachine.xml
similarity index 95%
rename from templates/dashmachine.xml
rename to templates/deprecated/dashmachine.xml
index 542079c..b24ad60 100644
--- a/templates/dashmachine.xml
+++ b/templates/deprecated/dashmachine.xml
@@ -13,12 +13,7 @@
   <WebUI>http://[IP]:[PORT:5000]</WebUI>
   <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/dashmachine.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/dashmachine.png</Icon>
-  <ExtraParams/>
-  <PostArgs/>
-  <DonateText/>
-  <DonateLink/>
   <Description>Another web application bookmark dashboard, with fun features.[br][br][b][u][span style='color: #ff9900;']Default user/password[/span][/u][/b][br]User: [B][u]admin[/B][/u][br]Password: [B][u]admin[/B][/u][/b]</Description>
-  <Labels/>
   <Config Name="Port" Target="5000" Default="" Mode="tcp" Description="Port" Type="Port" Display="always" Required="false" Mask="false">5000</Config>
   <Config Name="AppData" Target="/dashmachine/dashmachine/user_data" Default="" Mode="rw" Description="Container Path: /dashmachine/dashmachine/user_data" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/dashmachine/</Config>
 </Container>
diff --git a/templates/dispatch.xml b/templates/deprecated/dispatch.xml
similarity index 95%
rename from templates/dispatch.xml
rename to templates/deprecated/dispatch.xml
index 9dc0401..a14ee93 100644
--- a/templates/dispatch.xml
+++ b/templates/deprecated/dispatch.xml
@@ -13,10 +13,6 @@
   <WebUI>http://[IP]:[PORT:80]/</WebUI>
   <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/dispatch.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/dispatch.png</Icon>
-  <ExtraParams/>
-  <PostArgs/>
-  <DonateText/>
-  <DonateLink/>
   <Description>Web-based IRC client in Go. </Description>
   <Config Name="HTTP" Target="80" Default="8000" Mode="tcp" Description="HTTP" Type="Port" Display="always" Required="true" Mask="false">8000</Config>
   <Config Name="HTTPs" Target="443" Default="8443" Mode="tcp" Description="HTTPs (Not Required if you use reverse proxy)" Type="Port" Display="always" Required="false" Mask="false">4596</Config>
diff --git a/templates/droppy.xml b/templates/deprecated/droppy.xml
similarity index 96%
rename from templates/droppy.xml
rename to templates/deprecated/droppy.xml
index 4ae776a..184a119 100644
--- a/templates/droppy.xml
+++ b/templates/deprecated/droppy.xml
@@ -13,12 +13,7 @@
   <WebUI>http://[IP]:[PORT:8989]</WebUI>
   <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/droppy.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/droppy.png</Icon>
-  <ExtraParams/>
-  <PostArgs/>
-  <DonateText/>
-  <DonateLink/>
   <Description>Self-hosted file storage server with a web interface and capabilities to edit files and view media directly in the browser. </Description>
-  <Labels/>
   <Config Name="Port" Target="8989" Default="8686" Mode="tcp" Description="Container Port: 8989" Type="Port" Display="always" Required="false" Mask="false">8686</Config>
   <Config Name="Appdata" Target="/config" Default="" Mode="rw" Description="Container Path: /config" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/doppy/</Config>
   <Config Name="Files" Target="/files" Default="" Mode="rw" Description="Container Path: /files" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/droppy/</Config>
diff --git a/templates/golinks.xml b/templates/deprecated/golinks.xml
similarity index 93%
rename from templates/golinks.xml
rename to templates/deprecated/golinks.xml
index be15793..80e8a11 100644
--- a/templates/golinks.xml
+++ b/templates/deprecated/golinks.xml
@@ -13,11 +13,6 @@
   <WebUI>http://[IP]:[PORT:8000]</WebUI>
   <TemplateURL>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/golinks.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/A75G/docker-templates/master/templates/icons/golinks.png</Icon>
-  <ExtraParams/>
-  <PostArgs/>
-  <DonateText/>
-  <DonateLink/>
   <Description>Self-hosted smart bookmark search engine.</Description>
-  <Labels/>
   <Config Name="Port" Target="8000" Default="8000" Mode="tcp" Description="Port" Type="Port" Display="always" Required="false" Mask="false">8000</Config>
 </Container>
\ No newline at end of file
diff --git a/templates/healthchecks.xml b/templates/deprecated/healthchecks.xml
similarity index 100%
rename from templates/healthchecks.xml
rename to templates/deprecated/healthchecks.xml
diff --git a/templates/mailpile.xml b/templates/deprecated/mailpile.xml
similarity index 100%
rename from templates/mailpile.xml
rename to templates/deprecated/mailpile.xml
diff --git a/templates/mumble.xml b/templates/deprecated/mumble.xml
similarity index 100%
rename from templates/mumble.xml
rename to templates/deprecated/mumble.xml
diff --git a/templates/netbox.xml b/templates/deprecated/netbox.xml
similarity index 100%
rename from templates/netbox.xml
rename to templates/deprecated/netbox.xml
diff --git a/templates/pterodactyl-panel.xml b/templates/deprecated/pterodactyl-panel.xml
similarity index 100%
rename from templates/pterodactyl-panel.xml
rename to templates/deprecated/pterodactyl-panel.xml
diff --git a/templates/searx.xml b/templates/deprecated/searx.xml
similarity index 100%
rename from templates/searx.xml
rename to templates/deprecated/searx.xml