diff --git a/templates/minecraft_bukkit_server_unraid.xml b/templates/minecraft_bukkit_server_unraid.xml
deleted file mode 100644
index 914f884..0000000
--- a/templates/minecraft_bukkit_server_unraid.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<Container version="2">
-  <Name>Minecraft-bukkit</Name>
-  <Repository>gitea.fithwum.tech/fithwum/minecraft:bukkit</Repository>
-  <Registry>https://hub.docker.com/r/fithwum/minecraft/</Registry>
-  <Network>host</Network>
-  <MyIP/>
-  <Shell>sh</Shell>
-  <BindTime>true</BindTime>
-  <Privileged>false</Privileged>
-  <Support>https://forums.unraid.net/topic/125134-support-fithwum-minecraft-server/</Support>
-  <Project>https://www.minecraft.net/</Project>
-  <Overview>This docker will run a Minecraft bukkit server on java 21.</Overview>
-  <Category>GameServers:</Category>
-  <WebUI/>
-  <TemplateURL>https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/templates/minecraft_bukkit_server_unraid.xml</TemplateURL>
-  <Icon>https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/icons/minecraft-bukkit.png</Icon>
-  <ExtraParams/>
-  <PostArgs/>
-  <CPUset/>
-  <DateInstalled/>
-  <DonateText>Buy me a coffee if you like.</DonateText>
-  <DonateLink>https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2</DonateLink>
-  <Description>This docker will run a Minecraft bukkit server on java 21.</Description>
-  <Beta>False</Beta>
-  <Date>2026-07-02</Date>
-
-  <Changes>[font size=4][center]Minecraft[/center][/font]
-
-[font size=3][b](2022-06-16)[/b][/font]
-&#x00a0;&#x00a0;- Updated base image.
-&#x00a0;&#x00a0;&#x00a0;- New tang for vanilla, testing, fabric, bukkit have been added, the old minecraft fabric template will be removed.
-
-[font size=3][b](2022-06-16)[/b][/font]
-&#x00a0;&#x00a0;- Updated base image.
-&#x00a0;&#x00a0;&#x00a0;- Added the abillity to change server versions using docker tags.
-
-[font size=3][b](2020-07-01)[/b][/font]
-&#x00a0;&#x00a0;- First Test.
-  </Changes>
-  
-  <Networking>
-    <Mode>host</Mode>
-  </Networking>
-  <Data>
-    <Volume>
-      <HostDir>/mnt/user/appdata/minecraft-bukkit-server</HostDir>
-      <ContainerDir>/mc_server</ContainerDir>
-      <Mode>rw</Mode>
-    </Volume>
-  </Data>
-  <Environment>
-    <Variable>
-      <Value>99</Value>
-      <Name>PUID</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>100</Value>
-      <Name>PGID</Name>
-      <Mode/>
-    </Variable>
-  	<Variable>
-      <Value>false</Value>
-      <Name>ACCEPT_EULA</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value></Value>
-      <Name>MC_VERSION</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>25565</Value>
-      <Name>GAME_PORT</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>25</Value>
-      <Name>JAVA_VERSION</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>4G</Value>
-      <Name>XMX_SIZE</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>2G</Value>
-      <Name>XMS_SIZE</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>1G</Value>
-      <Name>XMN_SIZE</Name>
-      <Mode/>
-    </Variable>
-  </Environment>
-  <Labels/>
-  <Config Name="Minecraft Version" Target="MC_VERSION" Default="" Mode="" Description="Pick your Minecraft version." Type="Variable" Display="always" Required="true" Mask="false"></Config>
-  <Config Name="Java Version" Target="JAVA_VERSION" Default="21|25" Mode="" Description="Pick your Java version." Type="Variable" Display="always" Required="true" Mask="false"></Config>
-  <Config Name="Minecraft Port" Target="GAME_PORT" Default="25565" Mode="tcp" Description="Set game port (default: 25565)." Type="Variable" Display="always" Required="true" Mask="false">25565</Config>
-  <Config Name="Accept EULA" Target="ACCEPT_EULA" Default="false|true" Mode="" Description="Head over to: https://account.mojang.com/documents/minecraft_eula to read the EULA. (If you accept the EULA change the value to 'true' without quotes)." Type="Variable" Display="always" Required="true" Mask="false"></Config>
-  <Config Name="Java Xmx size" Target="XMX_SIZE" Default="4G" Mode="" Description="Set java memory." Type="Variable" Display="always" Required="true" Mask="false">4G</Config>
-  <Config Name="Java Xms size" Target="XMS_SIZE" Default="2G" Mode="" Description="Set java memory." Type="Variable" Display="always" Required="true" Mask="false">2G</Config>
-  <Config Name="Java Xmn size" Target="XMN_SIZE" Default="1G" Mode="" Description="Set java memory." Type="Variable" Display="always" Required="true" Mask="false">1G</Config>
-  <Config Name="AppData Config Path" Target="/mc_server" Default="/mnt/user/appdata/minecraft-bukkit-server" Mode="rw" Description="Container Path: /mc_server" Type="Path" Display="advanced-hide" Required="true" Mask="false">/mnt/user/appdata/minecraft-bukkit-server</Config>
-  <Config Name="Key 2" Target="PUID" Default="99" Mode="" Description="Container Variable: PUID" Type="Variable" Display="advanced-hide" Required="false" Mask="false">99</Config>
-  <Config Name="Key 3" Target="PGID" Default="100" Mode="" Description="Container Variable: PGID" Type="Variable" Display="advanced-hide" Required="false" Mask="false">100</Config>
-</Container>
diff --git a/templates/minecraft_fabric_server_unraid.xml b/templates/minecraft_fabric_server_unraid.xml
deleted file mode 100644
index dc85505..0000000
--- a/templates/minecraft_fabric_server_unraid.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<Container version="2">
-  <Name>Minecraft-fabric</Name>
-  <Repository>gitea.fithwum.tech/fithwum/minecraft:fabric</Repository>
-  <Registry>https://hub.docker.com/r/fithwum/minecraft/</Registry>
-  <Network>host</Network>
-  <MyIP/>
-  <Shell>sh</Shell>
-  <BindTime>true</BindTime>
-  <Privileged>false</Privileged>
-  <Support>https://forums.unraid.net/topic/125134-support-fithwum-minecraft-server/</Support>
-  <Project>https://www.minecraft.net/</Project>
-  <Overview>This docker will run a Minecraft fabric server on java 21.</Overview>
-  <Category>GameServers:</Category>
-  <WebUI/>
-  <TemplateURL>https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/templates/minecraft_fabric_server_unraid.xml</TemplateURL>
-  <Icon>https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/icons/minecraft-fabric.png</Icon>
-  <ExtraParams/>
-  <PostArgs/>
-  <CPUset/>
-  <DateInstalled/>
-  <DonateText>Buy me a coffee if you like.</DonateText>
-  <DonateLink>https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2</DonateLink>
-  <Description>This docker will run a Minecraft fabric server on java 21.</Description>
-  <Beta>False</Beta>
-  <Date>2026-07-02</Date>
-
-  <Changes>[font size=4][center]Minecraft[/center][/font]
-
-[font size=3][b](2022-06-16)[/b][/font]
-&#x00a0;&#x00a0;- Updated base image.
-&#x00a0;&#x00a0;&#x00a0;- New tang for fabric, vanilla, testing, fabric have been added, the old minecraft fabric template will be removed.
-
-[font size=3][b](2022-06-16)[/b][/font]
-&#x00a0;&#x00a0;- Updated base image.
-&#x00a0;&#x00a0;&#x00a0;- Added the abillity to change server versions using docker tags.
-
-[font size=3][b](2020-07-01)[/b][/font]
-&#x00a0;&#x00a0;- First Test.
-  </Changes>
-  
-  <Networking>
-    <Mode>host</Mode>
-  </Networking>
-  <Data>
-    <Volume>
-      <HostDir>/mnt/user/appdata/minecraft-fabric-server</HostDir>
-      <ContainerDir>/mc_server</ContainerDir>
-      <Mode>rw</Mode>
-    </Volume>
-  </Data>
-  <Environment>
-    <Variable>
-      <Value>99</Value>
-      <Name>PUID</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>100</Value>
-      <Name>PGID</Name>
-      <Mode/>
-    </Variable>
-  	<Variable>
-      <Value>false</Value>
-      <Name>ACCEPT_EULA</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value></Value>
-      <Name>FABRIC_VERSION</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value></Value>
-      <Name>INSTALLER_VERSION</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value></Value>
-      <Name>MC_VERSION</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>25565</Value>
-      <Name>GAME_PORT</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>25</Value>
-      <Name>JAVA_VERSION</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>4G</Value>
-      <Name>XMX_SIZE</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>2G</Value>
-      <Name>XMS_SIZE</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>1G</Value>
-      <Name>XMN_SIZE</Name>
-      <Mode/>
-    </Variable>
-  </Environment>
-  <Labels/>
-  <Config Name="Accept EULA" Target="ACCEPT_EULA" Default="false|true" Mode="" Description="Head over to: https://account.mojang.com/documents/minecraft_eula to read the EULA. (If you accept the EULA change the value to 'true' without quotes)." Type="Variable" Display="always" Required="true" Mask="false"></Config>
-  <Config Name="fabric version" Target="FABRIC_VERSION" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false"></Config>
-  <Config Name="installer version" Target="INSTALLER_VERSION" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false"></Config>
-  <Config Name="MC version" Target="MC_VERSION" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false"></Config>
-  <Config Name="Java Version" Target="JAVA_VERSION" Default="21|25" Mode="" Description="Pick your Java version." Type="Variable" Display="always" Required="true" Mask="false"></Config>
-  <Config Name="game port" Target="GAME_PORT" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">25566</Config>
-  <Config Name="XMX size" Target="XMX_SIZE" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">8G</Config>
-  <Config Name="XMS size" Target="XMS_SIZE" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">4G</Config>
-  <Config Name="XMN size" Target="XMN_SIZE" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">1G</Config>
-  <Config Name="AppData Config Path" Target="/mc_server" Default="/mnt/user/appdata/minecraft-server" Mode="rw" Description="Container Path: /mc_server" Type="Path" Display="advanced-hide" Required="true" Mask="false">/mnt/user/appdata/minecraft-fabric-server</Config>
-  <Config Name="Key 2" Target="PUID" Default="99" Mode="" Description="" Type="Variable" Display="advanced-hide" Required="false" Mask="false">99</Config>
-  <Config Name="Key 3" Target="PGID" Default="100" Mode="" Description="" Type="Variable" Display="advanced-hide" Required="false" Mask="false">100</Config>
-</Container>
diff --git a/templates/minecraft_server_unraid.xml b/templates/minecraft_server_unraid.xml
index bb52f6e..1f724f8 100644
--- a/templates/minecraft_server_unraid.xml
+++ b/templates/minecraft_server_unraid.xml
@@ -23,7 +23,7 @@
   <DonateLink>https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2</DonateLink>
   <Description>This docker can run a Minecraft vanilla/bukkit/forge/neoforged/fabric/quilt(your choice) server on openjdk21 or 25(your choice).</Description>
   <Beta>False</Beta>
-  <Date>2026-07-18</Date>
+  <Date>2026-07-19</Date>
 
   <Changes>[font size=4][center]Minecraft[/center][/font]
 
@@ -56,7 +56,7 @@
   </Data>
   <Environment>
     <Variable>
-      <Value>1.21.11</Value>
+      <Value></Value>
       <Name>MC_TYPE</Name>
       <Mode/>
     </Variable>
@@ -145,7 +145,7 @@
   <Config Name="Java Xmx size" Target="XMX_SIZE" Default="4G" Mode="" Description="Set java MAX memory." Type="Variable" Display="always" Required="true" Mask="false">4G</Config>
   <Config Name="Java Xms size" Target="XMS_SIZE" Default="2G" Mode="" Description="Set java memory." Type="Variable" Display="always" Required="true" Mask="false">2G</Config>
   <Config Name="Java Xmn size" Target="XMN_SIZE" Default="1G" Mode="" Description="Set java MIN memory." Type="Variable" Display="always" Required="true" Mask="false">1G</Config>
-  <Config Name="AppData Config Path" Target="/mc_server" Default="/mnt/user/appdata/minecraft-server" Mode="rw" Description="" Type="Path" Display="advanced-hide" Required="true" Mask="false">/mnt/user/Games/Servers/minecraft-server</Config>
-  <Config Name="Key 2" Target="PUID" Default="99" Mode="" Description="" Type="Variable" Display="advanced-hide" Required="false" Mask="false">99</Config>
-  <Config Name="Key 3" Target="PGID" Default="100" Mode="" Description="" Type="Variable" Display="advanced-hide" Required="false" Mask="false">100</Config>
+  <Config Name="AppData Config Path" Target="/mc_server" Default="/mnt/user/appdata/minecraft-server" Mode="rw" Description="" Type="Path" Display="advanced-hide" Required="true" Mask="false">/mnt/user/appdata/minecraft-server</Config>
+  <Config Name="PUID" Target="PUID" Default="99" Mode="" Description="" Type="Variable" Display="advanced-hide" Required="false" Mask="false">99</Config>
+  <Config Name="PGID" Target="PGID" Default="100" Mode="" Description="" Type="Variable" Display="advanced-hide" Required="false" Mask="false">100</Config>
 </Container>
diff --git a/templates/minecraft_vanilla_server_unraid.xml b/templates/minecraft_vanilla_server_unraid.xml
deleted file mode 100644
index c139755..0000000
--- a/templates/minecraft_vanilla_server_unraid.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<Container version="2">
-  <Name>Minecraft-vanilla</Name>
-  <Repository>gitea.fithwum.tech/fithwum/minecraft:vanilla</Repository>
-  <Registry>https://hub.docker.com/r/fithwum/minecraft/</Registry>
-  <Network>host</Network>
-  <MyIP/>
-  <Shell>sh</Shell>
-  <BindTime>true</BindTime>
-  <Privileged>false</Privileged>
-  <Support>https://forums.unraid.net/topic/125134-support-fithwum-minecraft-server/</Support>
-  <Project>https://www.minecraft.net/</Project>
-  <Overview>This docker will run a Minecraft vanilla server.</Overview>
-  <Category>GameServers:</Category>
-  <WebUI/>
-  <TemplateURL>https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/templates/minecraft_server_unraid.xml</TemplateURL>
-  <Icon>https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/icons/minecraft.png</Icon>
-  <ExtraParams/>
-  <PostArgs/>
-  <CPUset/>
-  <DateInstalled/>
-  <DonateText>Buy me a coffee if you like.</DonateText>
-  <DonateLink>https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2</DonateLink>
-  <Description>This docker will run a Minecraft vanilla server.</Description>
-  <Beta>False</Beta>
-  <Date>2026-07-02</Date>
-
-  <Changes>[font size=4][center]Minecraft[/center][/font]
-
-[font size=3][b](2022-06-16)[/b][/font]
-&#x00a0;&#x00a0;- Updated base image.
-&#x00a0;&#x00a0;&#x00a0;- New tang for vanilla, testing, fabric have been added, the old minecraft fabric template will be removed.
-
-[font size=3][b](2022-06-16)[/b][/font]
-&#x00a0;&#x00a0;- Updated base image.
-&#x00a0;&#x00a0;&#x00a0;- Added the abillity to change server versions using docker tags.
-
-[font size=3][b](2020-07-01)[/b][/font]
-&#x00a0;&#x00a0;- First Test.
-  </Changes>
-  
-  <Networking>
-    <Mode>host</Mode>
-  </Networking>
-  <Data>
-    <Volume>
-      <HostDir>/mnt/user/appdata/minecraft-server</HostDir>
-      <ContainerDir>/mc_server</ContainerDir>
-      <Mode>rw</Mode>
-    </Volume>
-  </Data>
-  <Environment>
-    <Variable>
-      <Value>99</Value>
-      <Name>PUID</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>100</Value>
-      <Name>PGID</Name>
-      <Mode/>
-    </Variable>
-  	<Variable>
-      <Value>false</Value>
-      <Name>ACCEPT_EULA</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>1.20.2</Value>
-      <Name>MC_VERSION</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>25</Value>
-      <Name>JAVA_VERSION</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>25565</Value>
-      <Name>GAME_PORT</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>4G</Value>
-      <Name>XMX_SIZE</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>2G</Value>
-      <Name>XMS_SIZE</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>1G</Value>
-      <Name>XMN_SIZE</Name>
-      <Mode/>
-    </Variable>
-  </Environment>
-  <Labels/>
-  <Config Name="Minecraft Version" Target="MC_VERSION" Default="1.20.2" Mode="" Description="Pick your Minecraft version." Type="Variable" Display="always" Required="true" Mask="false">1.20.2</Config>
-  <Config Name="Java Version" Target="JAVA_VERSION" Default="21|25" Mode="" Description="Pick your Java version." Type="Variable" Display="always" Required="true" Mask="false"></Config>
-  <Config Name="Minecraft Port" Target="GAME_PORT" Default="25565" Mode="tcp" Description="Set game port (default: 25565)." Type="Variable" Display="always" Required="true" Mask="false">25565</Config>
-  <Config Name="Accept EULA" Target="ACCEPT_EULA" Default="false|true" Mode="" Description="Head over to: https://account.mojang.com/documents/minecraft_eula to read the EULA. (If you accept the EULA change the value to 'true' without quotes)." Type="Variable" Display="always" Required="true" Mask="false"></Config>
-  <Config Name="Java Xmx size" Target="XMX_SIZE" Default="4G" Mode="" Description="Set java memory." Type="Variable" Display="always" Required="true" Mask="false">4G</Config>
-  <Config Name="Java Xms size" Target="XMS_SIZE" Default="2G" Mode="" Description="Set java memory." Type="Variable" Display="always" Required="true" Mask="false">2G</Config>
-  <Config Name="Java Xmn size" Target="XMN_SIZE" Default="1G" Mode="" Description="Set java memory." Type="Variable" Display="always" Required="true" Mask="false">1G</Config>
-  <Config Name="AppData Config Path" Target="/mc_server" Default="/mnt/user/appdata/minecraft-server" Mode="rw" Description="Container Path: /mc_server" Type="Path" Display="advanced-hide" Required="true" Mask="false">/mnt/user/appdata/minecraft-server</Config>
-  <Config Name="Key 2" Target="PUID" Default="99" Mode="" Description="Container Variable: PUID" Type="Variable" Display="advanced-hide" Required="false" Mask="false">99</Config>
-  <Config Name="Key 3" Target="PGID" Default="100" Mode="" Description="Container Variable: PGID" Type="Variable" Display="advanced-hide" Required="false" Mask="false">100</Config>
-</Container>