diff --git a/web/app/components/memshell/main-config-card.tsx b/web/app/components/memshell/main-config-card.tsx
index fbeda2d0..16384acc 100644
--- a/web/app/components/memshell/main-config-card.tsx
+++ b/web/app/components/memshell/main-config-card.tsx
@@ -51,6 +51,15 @@ import {
 import type { MemShellFormSchema } from "@/types/schema";
 import { Spinner } from "../ui/spinner";
 
+const JDKVersion = [
+  { name: "Java6", value: "50" },
+  { name: "Java8", value: "52" },
+  { name: "Java9", value: "53" },
+  { name: "Java11", value: "55" },
+  { name: "Java17", value: "61" },
+  { name: "Java21", value: "65" },
+];
+
 const shellToolIcons: Record<ShellToolType, JSX.Element> = {
   [ShellToolType.Behinder]: <ShieldOffIcon className="h-4 w-4" />,
   [ShellToolType.Godzilla]: <AxeIcon className="h-4 w-4" />,
@@ -62,13 +71,6 @@ const shellToolIcons: Record<ShellToolType, JSX.Element> = {
   [ShellToolType.Custom]: <ZapIcon className="h-4 w-4" />,
 };
 
-const defaultServerVersionOptions = [
-  {
-    name: "Unknown",
-    value: "Unknown",
-  },
-];
-
 export default function MainConfigCard({
   mainConfig,
   form,
@@ -85,9 +87,6 @@ export default function MainConfigCard({
   }>();
   const [shellTools, setShellTools] = useState<ShellToolType[]>([]);
   const [shellTypes, setShellTypes] = useState<string[]>([]);
-  const [serverVersionOptions, setServerVersionOptions] = useState(
-    defaultServerVersionOptions,
-  );
 
   const shellTool = useWatch({
     control: form.control,
@@ -132,24 +131,6 @@ export default function MainConfigCard({
           form.setValue("targetJdkVersion", "50");
         }
 
-        if (value === "TongWeb") {
-          setServerVersionOptions([
-            ...defaultServerVersionOptions,
-            { name: "6", value: "6" },
-            { name: "7", value: "7" },
-            { name: "8", value: "8" },
-          ]);
-        } else if (value === "Jetty") {
-          setServerVersionOptions([
-            ...defaultServerVersionOptions,
-            { name: "6", value: "6" },
-            { name: "7+", value: "7+" },
-            { name: "12", value: "12" },
-          ]);
-        } else {
-          setServerVersionOptions(defaultServerVersionOptions);
-        }
-
         form.resetField("serverVersion");
         form.resetField("byPassJavaModule");
         form.resetField("urlPattern");
@@ -315,22 +296,29 @@ export default function MainConfigCard({
                 />
                 <Controller
                   control={form.control}
-                  name="serverVersion"
+                  name="targetJdkVersion"
                   render={({ field, fieldState }) => (
                     <Field
                       orientation="vertical"
                       data-invalid={fieldState.invalid}
                     >
                       <FieldContent>
-                        <FieldLabel htmlFor="serverVersion">
-                          {t("common:serverVersion")}
+                        <FieldLabel htmlFor="targetJdkVersion">
+                          {t("common:targetJdkVersion")}
                         </FieldLabel>
                         <Select
-                          onValueChange={field.onChange}
+                          onValueChange={(v) => {
+                            if (Number.parseInt(v ?? "0", 10) >= 53) {
+                              form.setValue("byPassJavaModule", true);
+                            } else {
+                              form.setValue("byPassJavaModule", false);
+                            }
+                            field.onChange(v);
+                          }}
                           value={field.value}
                         >
                           <SelectTrigger
-                            id="serverVersion"
+                            id="targetJdkVersion"
                             aria-invalid={fieldState.invalid}
                           >
                             <SelectValue
@@ -338,7 +326,7 @@ export default function MainConfigCard({
                             />
                           </SelectTrigger>
                           <SelectContent>
-                            {serverVersionOptions.map((v) => (
+                            {JDKVersion.map((v) => (
                               <SelectItem key={v.value} value={v.value}>
                                 {v.name}
                               </SelectItem>
diff --git a/web/app/i18n/common/en.json b/web/app/i18n/common/en.json
index 2d5e7bed..c717b6e1 100644
--- a/web/app/i18n/common/en.json
+++ b/web/app/i18n/common/en.json
@@ -48,5 +48,6 @@
   "advancedConfig": "Advanced Config",
   "commandTemplate": "Command Template",
   "commandTemplate.placeholder": "e.g., sh -c \"{command}\" 2>&1",
-  "commandTemplate.description": "Use {command} as placeholder"
+  "commandTemplate.description": "Use {command} as placeholder",
+  "targetJdkVersion": "JRE Version"
 }
diff --git a/web/app/i18n/common/zh-CN.json b/web/app/i18n/common/zh-CN.json
index 69ff090c..8f9f94cc 100644
--- a/web/app/i18n/common/zh-CN.json
+++ b/web/app/i18n/common/zh-CN.json
@@ -48,5 +48,6 @@
   "advancedConfig": "高级配置",
   "commandTemplate": "命令模板",
   "commandTemplate.placeholder": "例如：sh -c \"{command}\" 2>&1",
-  "commandTemplate.description": "使用 {command} 作为占位符"
+  "commandTemplate.description": "使用 {command} 作为占位符",
+  "targetJdkVersion": "JRE 版本"
 }