diff --git a/Dockerfile b/Dockerfile
index e79f2f40..6fe6749a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
   curl \
   rlwrap \
   unzip \
-  openjdk-17-jre-headless \
+  openjdk-21-jre-headless \
   openjdk-8-jre-headless \
   ca-certificates-java \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 6cf28521..949a0b13 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -34,7 +34,7 @@ RUN apt-get update && apt-get install -y \
   git \
   curl \
   rlwrap \
-  openjdk-17-jre-headless \
+  openjdk-21-jre-headless \
   openjdk-8-jre-headless \
   ca-certificates-java \
   && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
diff --git a/docker-compose.yml b/docker-compose.yml
index 353ecb32..994bf394 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   mineos:
-    image: hexparrot/mineos:latest
+    image: andino66/mineos:latest
     container_name: mineos_server
     networks:
       - mineos
diff --git a/install_rootless.sh b/install_rootless.sh
index 47fdc506..0644eb6b 100644
--- a/install_rootless.sh
+++ b/install_rootless.sh
@@ -7,10 +7,10 @@ read -s UIPW
 # DOWNLOAD JAVA
 cd ~
 mkdir -p ~/.local/opt
-wget https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
-tar xf openjdk-17*
-mv ~/jdk-17.0.2 ~/.local/opt/
-JDK_PATH=$(realpath ~/.local/opt/jdk-17.0.2/bin)
+wget https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz
+tar xf openjdk-21*
+mv ~/jdk-21 ~/.local/opt/
+JDK_PATH=$(realpath ~/.local/opt/jdk-21/bin)
 
 # DOWNLOAD WEBUI FROM GITHUB
 git clone https://github.com/hexparrot/mineos-node