diff --git a/bukkit/Dockerfile b/bukkit/Dockerfile
index fbf561c..ae0ad8c 100644
--- a/bukkit/Dockerfile
+++ b/bukkit/Dockerfile
@@ -15,19 +15,13 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq openjdk-$JAVA_VERSION-jre-headless \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
-# Install java
-# RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 	&& dpkg -i packages-microsoft-prod.deb \
-# 	&& apt-get update && apt-get install -y msopenjdk-21 \
-# 	&& apt-get -y update && apt-get -y --fix-broken install
-
 # Folder creation.
 RUN mkdir -p /MCserver /MCtemp \
 	&& chmod 777 -R /MCserver /MCtemp \
diff --git a/bukkit/install_script.sh b/bukkit/install_script.sh
index 313312b..18ab505 100644
--- a/bukkit/install_script.sh
+++ b/bukkit/install_script.sh
@@ -10,6 +10,29 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
 MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/run.sh
 
+# Install java
+if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
+	then
+		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
+		apt-get update
+		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
+fi
+
+# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
+# 	then
+# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
+# 	else
+# 		echo " "
+# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
+# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+# 		dpkg -i packages-microsoft-prod.deb \
+# 		apt-get update && apt-get install -y msopenjdk-25 \
+# 		apt-get -y update && apt-get -y --fix-broken install
+# fi
+
 # Main install (Debian).
 # Check for server files and download if needed.
 if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
diff --git a/fabric/Dockerfile b/fabric/Dockerfile
index 7db91e9..06e024d 100644
--- a/fabric/Dockerfile
+++ b/fabric/Dockerfile
@@ -17,19 +17,13 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq openjdk-$JAVA_VERSION-jre-headless \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
-# Install java
-# RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 	&& dpkg -i packages-microsoft-prod.deb \
-# 	&& apt-get update && apt-get install -y msopenjdk-21 \
-# 	&& apt-get -y update && apt-get -y --fix-broken install
-
 # Folder creation.
 RUN mkdir -p /MCserver /MCtemp \
 	&& chmod 777 -R /MCserver /MCtemp \
diff --git a/fabric/install_script.sh b/fabric/install_script.sh
index 960eb5f..4a045a6 100644
--- a/fabric/install_script.sh
+++ b/fabric/install_script.sh
@@ -10,6 +10,29 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$INSTALLER_VERSION/server/jar
 MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/run.sh
 
+# Install java
+if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
+	then
+		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
+		apt-get update
+		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
+fi
+
+# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
+# 	then
+# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
+# 	else
+# 		echo " "
+# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
+# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+# 		dpkg -i packages-microsoft-prod.deb \
+# 		apt-get update && apt-get install -y msopenjdk-25 \
+# 		apt-get -y update && apt-get -y --fix-broken install
+# fi
+
 # Main install (Debian).
 # Check for server files and download if needed.
 if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
diff --git a/forge/Dockerfile b/forge/Dockerfile
index 97cd4f8..171bc76 100644
--- a/forge/Dockerfile
+++ b/forge/Dockerfile
@@ -15,19 +15,13 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq openjdk-$JAVA_VERSION-jre-headless \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
-# Install java
-# RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 	&& dpkg -i packages-microsoft-prod.deb \
-# 	&& apt-get update && apt-get install -y msopenjdk-21 \
-# 	&& apt-get -y update && apt-get -y --fix-broken install
-
 # Folder creation.
 RUN mkdir -p /MCserver /MCtemp \
 	&& chmod 777 -R /MCserver /MCtemp \
diff --git a/forge/Install_Script.sh b/forge/Install_Script.sh
index 7aef14f..692da2c 100644
--- a/forge/Install_Script.sh
+++ b/forge/Install_Script.sh
@@ -10,6 +10,29 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$MC_VERSION-$FORGE_VERSION/forge-$MC_VERSION-$FORGE_VERSION-installer.jar
 MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neoforged/run.sh
 
+# Install java
+if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
+	then
+		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
+		apt-get update
+		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
+fi
+
+# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
+# 	then
+# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
+# 	else
+# 		echo " "
+# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
+# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+# 		dpkg -i packages-microsoft-prod.deb \
+# 		apt-get update && apt-get install -y msopenjdk-25 \
+# 		apt-get -y update && apt-get -y --fix-broken install
+# fi
+
 # Main install (Debian).
 # Check for server files and download if needed.
 if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]
diff --git a/neoforged/Dockerfile b/neoforged/Dockerfile
index 3c57d78..7f945b0 100644
--- a/neoforged/Dockerfile
+++ b/neoforged/Dockerfile
@@ -14,19 +14,13 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq openjdk-$JAVA_VERSION-jre-headless \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
-# Install java
-# RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 	&& dpkg -i packages-microsoft-prod.deb \
-# 	&& apt-get update && apt-get install -y msopenjdk-21 \
-# 	&& apt-get -y update && apt-get -y --fix-broken install
-
 # Folder creation.
 RUN mkdir -p /MCserver /MCtemp \
 	&& chmod 777 -R /MCserver /MCtemp \
diff --git a/neoforged/Install_Script.sh b/neoforged/Install_Script.sh
index 1bdd30f..5e3ec59 100644
--- a/neoforged/Install_Script.sh
+++ b/neoforged/Install_Script.sh
@@ -9,6 +9,29 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 # Main Install Links
 INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar
 
+# Install java
+if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
+	then
+		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
+		apt-get update
+		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
+fi
+
+# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
+# 	then
+# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
+# 	else
+# 		echo " "
+# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
+# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+# 		dpkg -i packages-microsoft-prod.deb \
+# 		apt-get update && apt-get install -y msopenjdk-25 \
+# 		apt-get -y update && apt-get -y --fix-broken install
+# fi
+
 # Main install (Debian).
 # Check for server files and download if needed.
 if [ -e $MC_DIR/neoforge-$NEOFORGED_VERSION-installer.jar ]
diff --git a/quilt/Dockerfile b/quilt/Dockerfile
index ab8b9f4..85669d7 100644
--- a/quilt/Dockerfile
+++ b/quilt/Dockerfile
@@ -15,19 +15,13 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq openjdk-$JAVA_VERSION-jre-headless \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
-# Install java
-# RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 	&& dpkg -i packages-microsoft-prod.deb \
-# 	&& apt-get update && apt-get install -y msopenjdk-21 \
-# 	&& apt-get -y update && apt-get -y --fix-broken install
-
 # Folder creation.
 RUN mkdir -p /MCserver /MCtemp \
 	&& chmod 777 -R /MCserver /MCtemp \
diff --git a/quilt/Install_Script.sh b/quilt/Install_Script.sh
index cf1a893..8dffeed 100644
--- a/quilt/Install_Script.sh
+++ b/quilt/Install_Script.sh
@@ -10,6 +10,29 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
 MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/quilt/run.sh
 
+# Install java
+if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
+	then
+		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
+		apt-get update
+		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
+fi
+
+# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
+# 	then
+# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
+# 	else
+# 		echo " "
+# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
+# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+# 		dpkg -i packages-microsoft-prod.deb \
+# 		apt-get update && apt-get install -y msopenjdk-25 \
+# 		apt-get -y update && apt-get -y --fix-broken install
+# fi
+
 # Main install (Debian).
 # Check for server files and download if needed.
 if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ]
diff --git a/testing/Dockerfile b/testing/Dockerfile
index eeef69a..0d9f903 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -15,19 +15,13 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install Java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq openjdk-$JAVA_VERSION-jre-headless \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
-# Install java
-# RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 	&& dpkg -i packages-microsoft-prod.deb \
-# 	&& apt-get update && apt-get install -y msopenjdk-21 \
-# 	&& apt-get -y update && apt-get -y --fix-broken install
-
 # Folder creation.
 RUN mkdir -p /MCserver /MCtemp \
 	&& chmod 777 -R /MCserver /MCtemp \
diff --git a/testing/install_script.sh b/testing/install_script.sh
index e0128be..6e1984a 100644
--- a/testing/install_script.sh
+++ b/testing/install_script.sh
@@ -10,6 +10,29 @@ VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest
 MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
 MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/vanilla/run.sh
 
+# Install java
+if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
+	then
+		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
+		apt-get update
+		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
+fi
+
+# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
+# 	then
+# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
+# 	else
+# 		echo " "
+# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
+# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+# 		dpkg -i packages-microsoft-prod.deb \
+# 		apt-get update && apt-get install -y msopenjdk-25 \
+# 		apt-get -y update && apt-get -y --fix-broken install
+# fi
+
 # Main install (Debian).
 # Check for server files and download if needed.
 if [ -e $MC_DIR/MCserver-$MC_VERSION.jar ]
diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile
index 13177f9..68aed37 100644
--- a/vanilla/Dockerfile
+++ b/vanilla/Dockerfile
@@ -5,7 +5,7 @@ LABEL maintainer="fithwum"
 ENV ACCEPT_EULA=""
 ENV GAME_PORT=""
 ENV MC_VERSION=""
-ENV JAVA_VERSION="21"
+ENV JAVA_VERSION="25"
 ENV XMX_SIZE=""
 ENV XMS_SIZE=""
 ENV XMN_SIZE=""
@@ -15,19 +15,13 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install Java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq openjdk-$JAVA_VERSION-jre-headless \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
-# Install java
-# RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-# 	&& dpkg -i packages-microsoft-prod.deb \
-# 	&& apt-get update && apt-get install -y msopenjdk-21 \
-# 	&& apt-get -y update && apt-get -y --fix-broken install
-
 # Folder creation.
 RUN mkdir -p /MCserver /MCtemp \
 	&& chmod 777 -R /MCserver /MCtemp \
diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh
index e0128be..6e1984a 100644
--- a/vanilla/install_script.sh
+++ b/vanilla/install_script.sh
@@ -10,6 +10,29 @@ VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest
 MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
 MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/vanilla/run.sh
 
+# Install java
+if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
+	then
+		echo "INFO ! openjdk-$JAVA_VERSION-jre-headless installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! openjdk-$JAVA_VERSION-jre-headless not installed ... will install now."
+		apt-get update
+		apt-get --no-install-recommends -y install openjdk-$JAVA_VERSION-jre-headless
+fi
+
+# if dpkg -s msopenjdk-$JAVA_VERSION &> /dev/null
+# 	then
+# 		echo "INFO ! msopenjdk-$JAVA_VERSION installed ... moving on."
+# 	else
+# 		echo " "
+# 		echo "WARNING ! msopenjdk-$JAVA_VERSION not installed ... will install now."
+# 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+# 		dpkg -i packages-microsoft-prod.deb \
+# 		apt-get update && apt-get install -y msopenjdk-25 \
+# 		apt-get -y update && apt-get -y --fix-broken install
+# fi
+
 # Main install (Debian).
 # Check for server files and download if needed.
 if [ -e $MC_DIR/MCserver-$MC_VERSION.jar ]