diff --git a/ct/omada.sh b/ct/omada.sh
index 9a8da6bd7..5a7d881ad 100644
--- a/ct/omada.sh
+++ b/ct/omada.sh
@@ -42,6 +42,16 @@ function update_script() {
   $STD apt-get install -y --only-upgrade mongodb-org
   msg_ok "Updated MongoDB to $MONGODB_VERSION"
 
+  msg_info "Checking if right Azul Zulu Java is installed"
+  java_version=$(java -version 2>&1 | awk -F[\"_] '/version/ {print $2}')
+  if [[ "$java_version" =~ ^1\.8\.* ]]; then
+      $STD apt-get remove --purge -y zulu8-jdk
+      $STD apt-get -y install zulu21-jdk
+      msg_ok "Updated Azul Zulu Java to 21"
+  else
+      msg_ok "Azul Zulu Java 21 already installed"
+  fi
+
   msg_info "Updating Omada Controller"
   latest_url=$(curl -s "https://support.omadanetworks.com/en/download/software/omada-controller/" | grep -o 'https://static\.tp-link\.com/upload/software/[^"]*linux_x64[^"]*\.deb' | head -n 1)
   latest_version=$(basename "$latest_url")
@@ -51,7 +61,8 @@ function update_script() {
   fi
 
   wget -qL ${latest_url}
-  dpkg -i ${latest_version}
+  export DEBIAN_FRONTEND=noninteractive
+  $STD dpkg -i ${latest_version} 
   rm -rf ${latest_version}
   msg_ok "Updated Omada Controller"
 }
diff --git a/install/omada-install.sh b/install/omada-install.sh
index c2c76cdc4..ef29fa15d 100644
--- a/install/omada-install.sh
+++ b/install/omada-install.sh
@@ -34,7 +34,7 @@ wget -qO /etc/apt/trusted.gpg.d/zulu-repo.asc "https://keyserver.ubuntu.com/pks/
 wget -q https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb
 $STD dpkg -i zulu-repo_1.0.0-3_all.deb
 $STD apt-get update
-$STD apt-get -y install zulu8-jdk
+$STD apt-get -y install zulu21-jdk
 msg_ok "Installed Azul Zulu Java"
 
 msg_info "Installing libssl (if needed)"