diff --git a/templates/minecraft_bukkit_server_unraid.xml b/templates/minecraft_bukkit_server_unraid.xml
index 82aa746..914f884 100644
--- a/templates/minecraft_bukkit_server_unraid.xml
+++ b/templates/minecraft_bukkit_server_unraid.xml
@@ -98,7 +98,7 @@
   </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="25" Mode="" Description="Pick your Java version." Type="Variable" Display="always" Required="true" Mask="false">25</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>
diff --git a/templates/minecraft_fabric_server_unraid.xml b/templates/minecraft_fabric_server_unraid.xml
index 85bea6a..dc85505 100644
--- a/templates/minecraft_fabric_server_unraid.xml
+++ b/templates/minecraft_fabric_server_unraid.xml
@@ -111,7 +111,7 @@
   <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="25" Mode="" Description="Pick your Java version." Type="Variable" Display="always" Required="true" Mask="false">25</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>
diff --git a/templates/minecraft_forge_server_unraid.xml b/templates/minecraft_forge_server_unraid.xml
index 1dc6c88..5fb114e 100644
--- a/templates/minecraft_forge_server_unraid.xml
+++ b/templates/minecraft_forge_server_unraid.xml
@@ -105,7 +105,7 @@
   <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="forge version" Target="FORGE_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="25" Mode="" Description="Pick your Java version." Type="Variable" Display="always" Required="true" Mask="false">25</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">25565</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">2G</Config>
diff --git a/templates/minecraft_neoforged_server_unraid.xml b/templates/minecraft_neoforged_server_unraid.xml
index 6ad1cb7..d7e5b1f 100644
--- a/templates/minecraft_neoforged_server_unraid.xml
+++ b/templates/minecraft_neoforged_server_unraid.xml
@@ -104,7 +104,7 @@
   <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="neoforged version" Target="NEOFORGED_VERSION" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false"></Config>
-  <Config Name="Java Version" Target="JAVA_VERSION" Default="25" Mode="" Description="Pick your Java version." Type="Variable" Display="always" Required="true" Mask="false">25</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="server version" Target="SERVER_VERSION" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" 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>
diff --git a/templates/minecraft_quilt_server_unraid.xml b/templates/minecraft_quilt_server_unraid.xml
index 4e26188..9a3cd7d 100644
--- a/templates/minecraft_quilt_server_unraid.xml
+++ b/templates/minecraft_quilt_server_unraid.xml
@@ -105,7 +105,7 @@
   <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="quilt version" Target="QUILT_VERSION" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">0.12.1</Config>
   <Config Name="MC version" Target="MC_VERSION" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">1.21.11</Config>
-  <Config Name="Java Version" Target="JAVA_VERSION" Default="25" Mode="" Description="Pick your Java version." Type="Variable" Display="always" Required="true" Mask="false">25</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">25565</Config>
   <Config Name="XMX size" Target="XMX_SIZE" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">4G</Config>
   <Config Name="XMS size" Target="XMS_SIZE" Default="" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">2G</Config>
diff --git a/templates/minecraft_server_unraid.xml b/templates/minecraft_server_unraid.xml
index 0e64c39..bb52f6e 100644
--- a/templates/minecraft_server_unraid.xml
+++ b/templates/minecraft_server_unraid.xml
@@ -56,28 +56,43 @@
   </Data>
   <Environment>
     <Variable>
-      <Value>99</Value>
-      <Name>PUID</Name>
+      <Value>1.21.11</Value>
+      <Name>MC_TYPE</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>
+      <Value>1.21.11</Value>
       <Name>MC_VERSION</Name>
       <Mode/>
     </Variable>
     <Variable>
-      <Value>25</Value>
-      <Name>JAVA_VERSION</Name>
+      <Value>61.1.0</Value>
+      <Name>FORGE_VERSION</Name>
+      <Mode/>
+    </Variable>
+    <Variable>
+      <Value>21.11.44</Value>
+      <Name>NEOFORGED_VERSION</Name>
+      <Mode/>
+    </Variable>
+    <Variable>
+      <Value>0.19.3</Value>
+      <Name>FABRIC_VERSION</Name>
+      <Mode/>
+    </Variable>
+    <Variable>
+      <Value>1.1.1</Value>
+      <Name>FABRIC_INSTALLER_VERSION</Name>
+      <Mode/>
+    </Variable>
+    <Variable>
+      <Value>0.15.0</Value>
+      <Name>QUILT_VERSION</Name>
+      <Mode/>
+    </Variable>
+  	<Variable>
+      <Value></Value>
+      <Name>ACCEPT_EULA</Name>
       <Mode/>
     </Variable>
     <Variable>
@@ -85,6 +100,11 @@
       <Name>GAME_PORT</Name>
       <Mode/>
     </Variable>
+    <Variable>
+      <Value></Value>
+      <Name>JAVA_VERSION</Name>
+      <Mode/>
+    </Variable>
     <Variable>
       <Value>4G</Value>
       <Name>XMX_SIZE</Name>
@@ -100,18 +120,28 @@
       <Name>XMN_SIZE</Name>
       <Mode/>
     </Variable>
+    <Variable>
+      <Value>99</Value>
+      <Name>PUID</Name>
+      <Mode/>
+    </Variable>
+    <Variable>
+      <Value>100</Value>
+      <Name>PGID</Name>
+      <Mode/>
+    </Variable>
   </Environment>
   <Labels/>
   <Config Name="Minecraft Type" Target="MC_TYPE" Default="vanilla|bukkit|fabric|quilt|forge|neoforged" Mode="" Description="Select your Minecraft type" Type="Variable" Display="always" Required="true" Mask="false">vanilla</Config>
   <Config Name="Minecraft Version" Target="MC_VERSION" Default="1.21.11" Mode="" Description="Pick your Minecraft version." Type="Variable" Display="always" Required="true" Mask="false">1.21.11</Config>
-  <Config Name="quilt version" Target="QUILT_VERSION" Default="0.15.0" Mode="" Description="Set you Quilt version. (remove if not using)" Type="Variable" Display="always" Required="false" Mask="false">0.15.0</Config>
-  <Config Name="neoforged version" Target="NEOFORGED_VERSION" Default="21.11.44" Mode="" Description="Set you neoforged version. (remove if not using)" Type="Variable" Display="always" Required="false" Mask="false">21.11.44</Config>
   <Config Name="forge version" Target="FORGE_VERSION" Default="61.1.0" Mode="" Description="Set you forge version. (remove if not using)" Type="Variable" Display="always" Required="false" Mask="false">61.1.0</Config>
+  <Config Name="neoforged version" Target="NEOFORGED_VERSION" Default="21.11.44" Mode="" Description="Set you neoforged version. (remove if not using)" Type="Variable" Display="always" Required="false" Mask="false">21.11.44</Config>
   <Config Name="fabric version" Target="FABRIC_VERSION" Default="0.19.3" Mode="" Description="Set you fabric version. (remove if not using)" Type="Variable" Display="always" Required="false" Mask="false">0.19.3</Config>
   <Config Name="installer version" Target="FABRIC_INSTALLER_VERSION" Default="1.1.1" Mode="" Description="Set you fabric installer version. (remove if not using)" Type="Variable" Display="always" Required="false" Mask="false">1.1.1</Config>
+  <Config Name="quilt version" Target="QUILT_VERSION" Default="0.15.0" Mode="" Description="Set you Quilt version. (remove if not using)" Type="Variable" Display="always" Required="false" Mask="false">0.15.0</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 Version" Target="JAVA_VERSION" Default="25" Mode="" Description="Pick your Java version." Type="Variable" Display="always" Required="true" Mask="false">21</Config>
+  <Config Name="Java Version" Target="JAVA_VERSION" Default="21|25" Mode="" Description="Select your Java version." Type="Variable" Display="always" Required="true" Mask="false"></Config>
   <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>
diff --git a/templates/minecraft_vanilla_server_unraid.xml b/templates/minecraft_vanilla_server_unraid.xml
index 5767826..c139755 100644
--- a/templates/minecraft_vanilla_server_unraid.xml
+++ b/templates/minecraft_vanilla_server_unraid.xml
@@ -10,7 +10,7 @@
   <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 on java 21.</Overview>
+  <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>
@@ -21,7 +21,7 @@
   <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 on java 21.</Description>
+  <Description>This docker will run a Minecraft vanilla server.</Description>
   <Beta>False</Beta>
   <Date>2026-07-02</Date>
 
@@ -98,7 +98,7 @@
   </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="25" Mode="" Description="Pick your Java version." Type="Variable" Display="always" Required="true" Mask="false">25</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>