diff --git a/distributed/gateway/confs/gateway.sh b/distributed/gateway/confs/gateway.sh
index aed8baf2..14283f93 100755
--- a/distributed/gateway/confs/gateway.sh
+++ b/distributed/gateway/confs/gateway.sh
@@ -221,9 +221,9 @@ fi
 # ---------- Handle the SSL Issue with proper JDK version --------------------
 java_version=$("$JAVACMD" -version 2>&1 | awk -F '"' '/version/ {print $2}')
 java_version_formatted=$(echo "$java_version" | awk -F. '{printf("%02d%02d",$1,$2);}')
-if [ $java_version_formatted -lt 1100 ] || [ $java_version_formatted -gt 1700 ]; then
+if [ $java_version_formatted -lt 1100 ] || [ $java_version_formatted -gt 2100 ]; then
    echo " Starting WSO2 Carbon (in unsupported JDK)"
-   echo " [ERROR] CARBON is supported only between JDK 11 and JDK 17"
+   echo " [ERROR] CARBON is supported only between JDK 11 and JDK 21"
 fi
 
 CARBON_XBOOTCLASSPATH=""