diff --git a/bedrock/Dockerfile b/bedrock/Dockerfile
index 6c9de47..06ce4bf 100644
--- a/bedrock/Dockerfile
+++ b/bedrock/Dockerfile
@@ -13,10 +13,9 @@ ENV XMN_SIZE=""
 ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/bedrock/install_script.sh
 
 # Install java-17 & Dependencies.
-RUN apt-get -y update \
-	&& apt-get -y --fix-broken install \
-	&& apt-get install -y --no-install-recommends ca-certificates wget nano software-properties-common screen bzip2 jq curl \
-	&& apt-get clean \
+RUN apt -y update && apt autoclean && apt -y autoremove \
+	&& apt -y --fix-broken install \
+	&& apt install -y --no-install-recommends ca-certificates wget nano software-properties-common screen bzip2 jq curl \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
diff --git a/fabric/Dockerfile b/fabric/Dockerfile
index 122f232..1b87422 100644
--- a/fabric/Dockerfile
+++ b/fabric/Dockerfile
@@ -15,10 +15,9 @@ ENV XMN_SIZE=""
 ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/install_script.sh
 
 # Install java-17 & Dependencies.
-RUN apt-get -y update \
-	&& apt-get -y --fix-broken install \
-	&& apt-get install -y --no-install-recommends ca-certificates wget nano software-properties-common screen openjdk-17-jdk bzip2 \
-	&& apt-get clean \
+RUN apt -y update && apt autoclean && apt -y autoremove \
+	&& apt -y --fix-broken install \
+	&& apt install -y --no-install-recommends ca-certificates wget nano software-properties-common screen bzip2 jq curl \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
diff --git a/forge/Dockerfile b/forge/Dockerfile
index 06dc2de..7019dc0 100644
--- a/forge/Dockerfile
+++ b/forge/Dockerfile
@@ -9,10 +9,9 @@ ENV FORGE_URL=https://maven.minecraftforge.net/net/minecraftforge/forge/1.19.2-4
 ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/forge/forge-1.19.2/files/Install_Script.sh
 
 # Install java-17 & Dependencies.
-RUN apt-get -y update \
-	&& apt-get -y --fix-broken install \
-	&& apt-get install -y --no-install-recommends ca-certificates wget nano software-properties-common openjdk-17-jdk bzip2 \
-	&& apt-get clean \
+RUN apt -y update && apt autoclean && apt -y autoremove \
+	&& apt -y --fix-broken install \
+	&& apt install -y --no-install-recommends ca-certificates wget nano software-properties-common screen bzip2 jq curl \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
diff --git a/testing/Dockerfile b/testing/Dockerfile
index 3bed918..dacf5d9 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -13,10 +13,9 @@ ENV XMN_SIZE=""
 ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/testing/install_script.sh
 
 # Install java-17 & Dependencies.
-RUN apt-get -y update \
-	&& apt-get -y --fix-broken install \
-	&& apt-get install -y --no-install-recommends ca-certificates wget nano software-properties-common screen openjdk-17-jdk bzip2 jq curl \
-	&& apt-get clean \
+RUN apt -y update && apt autoclean && apt -y autoremove \
+	&& apt -y --fix-broken install \
+	&& apt install -y --no-install-recommends ca-certificates wget nano software-properties-common screen bzip2 jq curl \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;
 
diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile
index 43241d4..a7a4058 100644
--- a/vanilla/Dockerfile
+++ b/vanilla/Dockerfile
@@ -13,10 +13,9 @@ ENV XMN_SIZE=""
 ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/vanilla/install_script.sh
 
 # Install java-17 & Dependencies.
-RUN apt-get -y update \
-	&& apt-get -y --fix-broken install \
-	&& apt-get install -y --no-install-recommends ca-certificates wget nano software-properties-common screen openjdk-17-jdk bzip2 jq curl \
-	&& apt-get clean \
+RUN apt -y update && apt autoclean && apt -y autoremove \
+	&& apt -y --fix-broken install \
+	&& apt install -y --no-install-recommends ca-certificates wget nano software-properties-common screen bzip2 jq curl \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& update-ca-certificates -f;