diff --git a/apps/admin/app/dashboard/server/form-schema.ts b/apps/admin/app/dashboard/server/form-schema.ts
index d19232d..bc1dc3b 100644
--- a/apps/admin/app/dashboard/server/form-schema.ts
+++ b/apps/admin/app/dashboard/server/form-schema.ts
@@ -92,9 +92,17 @@ const baseFormSchema = z.object({
   speed_limit: z.number().nullish(),
   traffic_ratio: z.number().default(1),
   group_id: z.number().nullish(),
-  enable_relay: z.boolean().nullish().default(false),
-  relay_host: nullableString,
-  relay_port: portSchema,
+  relay_mode: z.string().nullish().default('none'),
+  relay_node: z
+    .array(
+      z.object({
+        host: z.string(),
+        port: portSchema,
+        prefix: z.string().nullish(),
+      }),
+    )
+    .nullish()
+    .default([]),
 });
 
 export const formSchema = z.intersection(baseFormSchema, protocolConfigSchema);
diff --git a/apps/admin/app/dashboard/server/node-form.tsx b/apps/admin/app/dashboard/server/node-form.tsx
index ab60bd6..fc1fc21 100644
--- a/apps/admin/app/dashboard/server/node-form.tsx
+++ b/apps/admin/app/dashboard/server/node-form.tsx
@@ -33,6 +33,7 @@ import {
 import { Switch } from '@workspace/ui/components/switch';
 import { Tabs, TabsList, TabsTrigger } from '@workspace/ui/components/tabs';
 import { Combobox } from '@workspace/ui/custom-components/combobox';
+import { ArrayInput } from '@workspace/ui/custom-components/dynamic-Inputs';
 import { EnhancedInput } from '@workspace/ui/custom-components/enhanced-input';
 import { cn } from '@workspace/ui/lib/utils';
 import { unitConversion } from '@workspace/ui/utils';
@@ -75,6 +76,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
   const protocol = form.watch('protocol');
   const transport = form.watch('config.transport');
   const security = form.watch('config.security');
+  const relayMode = form.watch('relay_mode');
 
   useEffect(() => {
     form?.reset(initialValues);
@@ -105,7 +107,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
           {trigger}
         </Button>
       </SheetTrigger>
-      <SheetContent className='w-[500px] max-w-full md:max-w-screen-md'>
+      <SheetContent className='w-[520px] max-w-full md:max-w-screen-md'>
         <SheetHeader>
           <SheetTitle>{title}</SheetTitle>
         </SheetHeader>
@@ -214,65 +216,6 @@ export default function NodeForm<T extends { [x: string]: any }>({
                     </FormItem>
                   )}
                 />
-                <FormField
-                  control={form.control}
-                  name='enable_relay'
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t('form.enableRelay')}</FormLabel>
-                      <FormControl>
-                        <div className='pt-2'>
-                          <Switch
-                            checked={!!field.value}
-                            onCheckedChange={(value) => {
-                              form.setValue(field.name, value);
-                            }}
-                          />
-                        </div>
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name='relay_host'
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t('form.relayHost')}</FormLabel>
-                      <FormControl>
-                        <EnhancedInput
-                          {...field}
-                          onValueChange={(value) => {
-                            form.setValue(field.name, value);
-                          }}
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name='relay_port'
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t('form.relayPort')}</FormLabel>
-                      <FormControl>
-                        <EnhancedInput
-                          {...field}
-                          type='number'
-                          min={1}
-                          max={65535}
-                          onValueChange={(value) => {
-                            form.setValue(field.name, value);
-                          }}
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
               </div>
 
               <FormField
@@ -358,6 +301,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
                           <EnhancedInput
                             {...field}
                             type='number'
+                            placeholder='1-65535'
                             min={1}
                             max={65535}
                             onValueChange={(value) => {
@@ -389,6 +333,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
                             <EnhancedInput
                               {...field}
                               type='number'
+                              placeholder='1-65535'
                               onValueChange={(value) => {
                                 form.setValue(field.name, value);
                               }}
@@ -499,7 +444,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
                           control={form.control}
                           name='config.transport'
                           render={({ field }) => (
-                            <FormItem className='min-w-32'>
+                            <FormItem className='!mt-0 min-w-32'>
                               <FormControl>
                                 <Select
                                   value={field.value}
@@ -603,7 +548,7 @@ export default function NodeForm<T extends { [x: string]: any }>({
                         control={form.control}
                         name='config.security'
                         render={({ field }) => (
-                          <FormItem className='min-w-32'>
+                          <FormItem className='!mt-0 min-w-32'>
                             <Select
                               value={field.value}
                               onValueChange={(value) => {
@@ -814,6 +759,84 @@ export default function NodeForm<T extends { [x: string]: any }>({
                   </Card>
                 </div>
               )}
+
+              <Card>
+                <CardHeader className='flex flex-row items-center justify-between p-3'>
+                  <CardTitle>{t('form.relayMode')}</CardTitle>
+                  <FormField
+                    control={form.control}
+                    name='relay_mode'
+                    render={({ field }) => (
+                      <FormItem className='!mt-0 min-w-32'>
+                        <FormControl>
+                          <Select
+                            value={field.value}
+                            onValueChange={(value) => {
+                              form.setValue(field.name, value);
+                            }}
+                          >
+                            <FormControl>
+                              <SelectTrigger>
+                                <SelectValue placeholder={t('form.selectRelayMode')} />
+                              </SelectTrigger>
+                            </FormControl>
+                            <SelectContent>
+                              <SelectItem value='none'>
+                                {t('form.relayModeOptions.none')}
+                              </SelectItem>
+                              <SelectItem value='all'>{t('form.relayModeOptions.all')}</SelectItem>
+                              <SelectItem value='random'>
+                                {t('form.relayModeOptions.random')}
+                              </SelectItem>
+                            </SelectContent>
+                          </Select>
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+                </CardHeader>
+                {relayMode !== 'none' && (
+                  <CardContent className='w-full space-y-3 px-3'>
+                    <FormField
+                      control={form.control}
+                      name='relay_node'
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormControl>
+                            <ArrayInput
+                              fields={[
+                                {
+                                  name: 'host',
+                                  type: 'text',
+                                  placeholder: t('form.relayHost'),
+                                },
+                                {
+                                  name: 'port',
+                                  type: 'number',
+                                  min: 1,
+                                  max: 65535,
+                                  placeholder: t('form.relayPort'),
+                                },
+                                {
+                                  name: 'prefix',
+                                  type: 'text',
+                                  placeholder: t('form.relayPrefix'),
+                                },
+                              ]}
+                              value={field.value}
+                              onChange={(value) => {
+                                form.setValue(field.name, value);
+                              }}
+                            />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                  </CardContent>
+                )}
+              </Card>
             </form>
           </Form>
         </ScrollArea>
diff --git a/apps/admin/app/dashboard/system/node.tsx b/apps/admin/app/dashboard/system/node.tsx
index 0308b83..2719bdc 100644
--- a/apps/admin/app/dashboard/system/node.tsx
+++ b/apps/admin/app/dashboard/system/node.tsx
@@ -177,7 +177,7 @@ export default function Node() {
       </Table>
       <div className='flex flex-col-reverse gap-8 px-4 pt-6 md:flex-row md:items-start'>
         <div className='w-full md:w-1/2'>
-          <ChartContainer config={chartConfig} className='mx-auto aspect-square max-w-[400px]'>
+          <ChartContainer config={chartConfig} className='mx-auto aspect-[4/3] max-w-[400px]'>
             <PieChart>
               <Pie
                 data={chartTimeSlots}
diff --git a/apps/admin/locales/cs-CZ/server.json b/apps/admin/locales/cs-CZ/server.json
index 1473a49..43e84bb 100644
--- a/apps/admin/locales/cs-CZ/server.json
+++ b/apps/admin/locales/cs-CZ/server.json
@@ -49,7 +49,6 @@
       "confirm": "Potvrdit",
       "edit": "Upravit",
       "editSecurity": "Upravit nastavení zabezpečení",
-      "enableRelay": "Povolit přenos",
       "enableTLS": "Povolit TLS",
       "encryptionMethod": "Metoda šifrování",
       "flow": "Algoritmus řízení toku",
@@ -65,7 +64,14 @@
       "port": "Port služby",
       "protocol": "Protokol",
       "relayHost": "Adresa přenosu",
+      "relayMode": "Režim relé",
+      "relayModeOptions": {
+        "all": "Vše",
+        "none": "Žádný",
+        "random": "Náhodný"
+      },
       "relayPort": "Port přenosu",
+      "relayPrefix": "Předpona relé",
       "remarks": "Poznámky",
       "security": "Zabezpečení",
       "securityConfig": "Nastavení zabezpečení",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Vyberte metodu šifrování",
       "selectNodeGroup": "Vyberte skupinu uzlů",
       "selectProtocol": "Vyberte protokol",
+      "selectRelayMode": "Vyberte režim relé",
       "serverAddr": "Adresa serveru",
       "serverName": "Název služby",
       "speedLimit": "Omezení rychlosti",
diff --git a/apps/admin/locales/de-DE/server.json b/apps/admin/locales/de-DE/server.json
index e50eeee..eab6252 100644
--- a/apps/admin/locales/de-DE/server.json
+++ b/apps/admin/locales/de-DE/server.json
@@ -49,7 +49,6 @@
       "confirm": "Bestätigen",
       "edit": "Bearbeiten",
       "editSecurity": "Sicherheitskonfiguration bearbeiten",
-      "enableRelay": "Relay aktivieren",
       "enableTLS": "TLS aktivieren",
       "encryptionMethod": "Verschlüsselungsmethode",
       "flow": "Flusskontrollalgorithmus",
@@ -65,7 +64,14 @@
       "port": "Serverport",
       "protocol": "Protokoll",
       "relayHost": "Relay-Adresse",
+      "relayMode": "Relaismodus",
+      "relayModeOptions": {
+        "all": "Alle",
+        "none": "Keine",
+        "random": "Zufällig"
+      },
       "relayPort": "Relay-Port",
+      "relayPrefix": "Relaispräfix",
       "remarks": "Bemerkungen",
       "security": "Sicherheit",
       "securityConfig": "Sicherheitskonfiguration",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Verschlüsselungsmethode auswählen",
       "selectNodeGroup": "Knotengruppe auswählen",
       "selectProtocol": "Protokoll auswählen",
+      "selectRelayMode": "Relaismodus auswählen",
       "serverAddr": "Serveradresse",
       "serverName": "Dienstname",
       "speedLimit": "Geschwindigkeitsbegrenzung",
diff --git a/apps/admin/locales/en-US/server.json b/apps/admin/locales/en-US/server.json
index 4b53e0a..f6c4047 100644
--- a/apps/admin/locales/en-US/server.json
+++ b/apps/admin/locales/en-US/server.json
@@ -49,7 +49,6 @@
       "confirm": "Confirm",
       "edit": "Edit",
       "editSecurity": "Edit Security Configuration",
-      "enableRelay": "Enable Relay",
       "enableTLS": "Enable TLS",
       "encryptionMethod": "Encryption Method",
       "flow": "Flow Control Algorithm",
@@ -62,10 +61,18 @@
       "obfsPasswordPlaceholder": "Leave blank for no obfuscation",
       "path": "Path",
       "pleaseSelect": "Please Select",
+      "selectRelayMode": "Select Relay Mode",
+      "relayModeOptions": {
+        "none": "None",
+        "all": "All",
+        "random": "Random"
+      },
       "port": "Server Port",
       "protocol": "Protocol",
+      "relayMode": "Relay Mode",
       "relayHost": "Relay Host",
       "relayPort": "Relay Port",
+      "relayPrefix": "Relay Prefix",
       "remarks": "Remarks",
       "security": "Security",
       "securityConfig": "Security Configuration",
diff --git a/apps/admin/locales/es-ES/server.json b/apps/admin/locales/es-ES/server.json
index 76321ca..e73f0ce 100644
--- a/apps/admin/locales/es-ES/server.json
+++ b/apps/admin/locales/es-ES/server.json
@@ -49,7 +49,6 @@
       "confirm": "Confirmar",
       "edit": "Editar",
       "editSecurity": "Editar configuración de seguridad",
-      "enableRelay": "Habilitar retransmisión",
       "enableTLS": "Habilitar TLS",
       "encryptionMethod": "Método de encriptación",
       "flow": "Algoritmo de control de flujo",
@@ -65,7 +64,14 @@
       "port": "Puerto del servidor",
       "protocol": "Protocolo",
       "relayHost": "Dirección de retransmisión",
+      "relayMode": "Modo de retransmisión",
+      "relayModeOptions": {
+        "all": "Todos",
+        "none": "Ninguno",
+        "random": "Aleatorio"
+      },
       "relayPort": "Puerto de retransmisión",
+      "relayPrefix": "Prefijo de retransmisión",
       "remarks": "Observaciones",
       "security": "Seguridad",
       "securityConfig": "Configuración de seguridad",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Seleccionar método de encriptación",
       "selectNodeGroup": "Seleccionar grupo de nodos",
       "selectProtocol": "Seleccionar protocolo",
+      "selectRelayMode": "Seleccionar modo de retransmisión",
       "serverAddr": "Dirección del servidor",
       "serverName": "Nombre del servicio",
       "speedLimit": "Límite de velocidad",
diff --git a/apps/admin/locales/es-MX/server.json b/apps/admin/locales/es-MX/server.json
index a6ebf48..f6719b5 100644
--- a/apps/admin/locales/es-MX/server.json
+++ b/apps/admin/locales/es-MX/server.json
@@ -49,7 +49,6 @@
       "confirm": "Confirmar",
       "edit": "Editar",
       "editSecurity": "Editar configuración de seguridad",
-      "enableRelay": "Habilitar retransmisión",
       "enableTLS": "Habilitar TLS",
       "encryptionMethod": "Método de encriptación",
       "flow": "Algoritmo de control de flujo",
@@ -65,7 +64,14 @@
       "port": "Puerto del servidor",
       "protocol": "Protocolo",
       "relayHost": "Dirección de retransmisión",
+      "relayMode": "Modo de retransmisión",
+      "relayModeOptions": {
+        "all": "Todos",
+        "none": "Ninguno",
+        "random": "Aleatorio"
+      },
       "relayPort": "Puerto de retransmisión",
+      "relayPrefix": "Prefijo de retransmisión",
       "remarks": "Comentarios",
       "security": "Seguridad",
       "securityConfig": "Configuración de seguridad",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Seleccionar método de encriptación",
       "selectNodeGroup": "Seleccionar grupo de nodos",
       "selectProtocol": "Seleccionar protocolo",
+      "selectRelayMode": "Seleccionar modo de retransmisión",
       "serverAddr": "Dirección del servidor",
       "serverName": "Nombre del servicio",
       "speedLimit": "Límite de velocidad",
diff --git a/apps/admin/locales/fa-IR/server.json b/apps/admin/locales/fa-IR/server.json
index 68b0e13..22e3641 100644
--- a/apps/admin/locales/fa-IR/server.json
+++ b/apps/admin/locales/fa-IR/server.json
@@ -49,7 +49,6 @@
       "confirm": "تأیید",
       "edit": "ویرایش",
       "editSecurity": "ویرایش تنظیمات امنیتی",
-      "enableRelay": "فعال‌سازی رله",
       "enableTLS": "فعال‌سازی TLS",
       "encryptionMethod": "روش رمزنگاری",
       "flow": "الگوریتم کنترل جریان",
@@ -65,7 +64,14 @@
       "port": "پورت سرور",
       "protocol": "پروتکل",
       "relayHost": "میزبان رله",
+      "relayMode": "حالت رله",
+      "relayModeOptions": {
+        "all": "همه",
+        "none": "هیچ‌کدام",
+        "random": "تصادفی"
+      },
       "relayPort": "پورت رله",
+      "relayPrefix": "پیشوند رله",
       "remarks": "توضیحات",
       "security": "امنیت",
       "securityConfig": "پیکربندی امنیتی",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "انتخاب روش رمزنگاری",
       "selectNodeGroup": "انتخاب گروه گره",
       "selectProtocol": "انتخاب پروتکل",
+      "selectRelayMode": "انتخاب حالت رله",
       "serverAddr": "آدرس سرور",
       "serverName": "نام سرویس",
       "speedLimit": "محدودیت سرعت",
diff --git a/apps/admin/locales/fi-FI/server.json b/apps/admin/locales/fi-FI/server.json
index d9c8220..b93720c 100644
--- a/apps/admin/locales/fi-FI/server.json
+++ b/apps/admin/locales/fi-FI/server.json
@@ -49,7 +49,6 @@
       "confirm": "Vahvista",
       "edit": "Muokkaa",
       "editSecurity": "Muokkaa suojausasetuksia",
-      "enableRelay": "Ota välitys käyttöön",
       "enableTLS": "Ota TLS käyttöön",
       "encryptionMethod": "Salausmenetelmä",
       "flow": "Virtausalgoritmi",
@@ -65,7 +64,14 @@
       "port": "Palvelinportti",
       "protocol": "Protokolla",
       "relayHost": "Välityksen osoite",
+      "relayMode": "Välitystila",
+      "relayModeOptions": {
+        "all": "Kaikki",
+        "none": "Ei mitään",
+        "random": "Satunnainen"
+      },
       "relayPort": "Välityksen portti",
+      "relayPrefix": "Välitys etuliite",
       "remarks": "Huomautukset",
       "security": "Turvallisuus",
       "securityConfig": "Turvallisuusasetukset",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Valitse salausmenetelmä",
       "selectNodeGroup": "Valitse solmuryhmä",
       "selectProtocol": "Valitse protokolla",
+      "selectRelayMode": "Valitse välitystila",
       "serverAddr": "Palvelimen osoite",
       "serverName": "Palvelimen nimi",
       "speedLimit": "Nopeusrajoitus",
diff --git a/apps/admin/locales/fr-FR/server.json b/apps/admin/locales/fr-FR/server.json
index 65503b6..b643cee 100644
--- a/apps/admin/locales/fr-FR/server.json
+++ b/apps/admin/locales/fr-FR/server.json
@@ -49,7 +49,6 @@
       "confirm": "Confirmer",
       "edit": "Éditer",
       "editSecurity": "Éditer la configuration de sécurité",
-      "enableRelay": "Activer le relais",
       "enableTLS": "Activer TLS",
       "encryptionMethod": "Méthode de cryptage",
       "flow": "Algorithme de contrôle de flux",
@@ -65,7 +64,14 @@
       "port": "Port de service",
       "protocol": "Protocole",
       "relayHost": "Adresse de relais",
+      "relayMode": "Mode relais",
+      "relayModeOptions": {
+        "all": "Tous",
+        "none": "Aucun",
+        "random": "Aléatoire"
+      },
       "relayPort": "Port de relais",
+      "relayPrefix": "Préfixe relais",
       "remarks": "Remarques",
       "security": "Sécurité",
       "securityConfig": "Configuration de sécurité",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Sélectionner la méthode de cryptage",
       "selectNodeGroup": "Sélectionner le groupe de nœuds",
       "selectProtocol": "Sélectionner le protocole",
+      "selectRelayMode": "Sélectionner le mode relais",
       "serverAddr": "Adresse du serveur",
       "serverName": "Nom du service",
       "speedLimit": "Limite de vitesse",
diff --git a/apps/admin/locales/hi-IN/server.json b/apps/admin/locales/hi-IN/server.json
index aa8c231..b0da7ee 100644
--- a/apps/admin/locales/hi-IN/server.json
+++ b/apps/admin/locales/hi-IN/server.json
@@ -49,7 +49,6 @@
       "confirm": "पुष्टि करें",
       "edit": "संपादित करें",
       "editSecurity": "सुरक्षा कॉन्फ़िगरेशन संपादित करें",
-      "enableRelay": "रिले सक्षम करें",
       "enableTLS": "TLS सक्षम करें",
       "encryptionMethod": "एन्क्रिप्शन विधि",
       "flow": "फ्लो कंट्रोल एल्गोरिदम",
@@ -65,7 +64,14 @@
       "port": "सर्वर पोर्ट",
       "protocol": "प्रोटोकॉल",
       "relayHost": "रिले पता",
+      "relayMode": "रिले मोड",
+      "relayModeOptions": {
+        "all": "सभी",
+        "none": "कोई नहीं",
+        "random": "यादृच्छिक"
+      },
       "relayPort": "रिले पोर्ट",
+      "relayPrefix": "रिले उपसर्ग",
       "remarks": "टिप्पणियाँ",
       "security": "सुरक्षा",
       "securityConfig": "सुरक्षा कॉन्फ़िगरेशन",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "एन्क्रिप्शन विधि चुनें",
       "selectNodeGroup": "नोड समूह चुनें",
       "selectProtocol": "प्रोटोकॉल चुनें",
+      "selectRelayMode": "रिले मोड चुनें",
       "serverAddr": "सर्वर पता",
       "serverName": "सेवा नाम",
       "speedLimit": "गति सीमा",
diff --git a/apps/admin/locales/hu-HU/server.json b/apps/admin/locales/hu-HU/server.json
index 9e07b9e..7f4b712 100644
--- a/apps/admin/locales/hu-HU/server.json
+++ b/apps/admin/locales/hu-HU/server.json
@@ -49,7 +49,6 @@
       "confirm": "Megerősít",
       "edit": "Szerkesztés",
       "editSecurity": "Biztonsági beállítások szerkesztése",
-      "enableRelay": "Átjátszás engedélyezése",
       "enableTLS": "TLS engedélyezése",
       "encryptionMethod": "Titkosítási módszer",
       "flow": "Áramlásszabályozási algoritmus",
@@ -65,7 +64,14 @@
       "port": "Szolgáltatási port",
       "protocol": "Protokoll",
       "relayHost": "Átjátszó cím",
+      "relayMode": "Relé mód",
+      "relayModeOptions": {
+        "all": "Összes",
+        "none": "Nincs",
+        "random": "Véletlenszerű"
+      },
       "relayPort": "Átjátszó port",
+      "relayPrefix": "Relé előtag",
       "remarks": "Megjegyzések",
       "security": "Biztonság",
       "securityConfig": "Biztonsági beállítások",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Válasszon titkosítási módszert",
       "selectNodeGroup": "Válasszon csomópont csoportot",
       "selectProtocol": "Válasszon protokollt",
+      "selectRelayMode": "Válassza ki a relé módot",
       "serverAddr": "Szerver cím",
       "serverName": "Szolgáltatás neve",
       "speedLimit": "Sebességkorlátozás",
diff --git a/apps/admin/locales/ja-JP/server.json b/apps/admin/locales/ja-JP/server.json
index 614d37b..7bec504 100644
--- a/apps/admin/locales/ja-JP/server.json
+++ b/apps/admin/locales/ja-JP/server.json
@@ -49,7 +49,6 @@
       "confirm": "確認",
       "edit": "編集",
       "editSecurity": "セキュリティ設定を編集",
-      "enableRelay": "リレーを有効化",
       "enableTLS": "TLSを有効化",
       "encryptionMethod": "暗号化方式",
       "flow": "フロー制御アルゴリズム",
@@ -65,7 +64,14 @@
       "port": "サーバーポート",
       "protocol": "プロトコル",
       "relayHost": "リレーアドレス",
+      "relayMode": "リレーモード",
+      "relayModeOptions": {
+        "all": "すべて",
+        "none": "なし",
+        "random": "ランダム"
+      },
       "relayPort": "リレーポート",
+      "relayPrefix": "リレープレフィックス",
       "remarks": "備考",
       "security": "セキュリティ",
       "securityConfig": "セキュリティ設定",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "暗号化方式を選択",
       "selectNodeGroup": "ノードグループを選択",
       "selectProtocol": "プロトコルを選択",
+      "selectRelayMode": "リレーモードを選択",
       "serverAddr": "サーバーアドレス",
       "serverName": "サービス名",
       "speedLimit": "速度制限",
diff --git a/apps/admin/locales/ko-KR/server.json b/apps/admin/locales/ko-KR/server.json
index e6ed923..e1a8acd 100644
--- a/apps/admin/locales/ko-KR/server.json
+++ b/apps/admin/locales/ko-KR/server.json
@@ -49,7 +49,6 @@
       "confirm": "확인",
       "edit": "편집",
       "editSecurity": "보안 설정 편집",
-      "enableRelay": "중계 활성화",
       "enableTLS": "TLS 활성화",
       "encryptionMethod": "암호화 방법",
       "flow": "흐름 제어 알고리즘",
@@ -65,7 +64,14 @@
       "port": "서비스 포트",
       "protocol": "프로토콜",
       "relayHost": "중계 주소",
+      "relayMode": "릴레이 모드",
+      "relayModeOptions": {
+        "all": "모두",
+        "none": "없음",
+        "random": "무작위"
+      },
       "relayPort": "중계 포트",
+      "relayPrefix": "릴레이 접두사",
       "remarks": "비고",
       "security": "보안",
       "securityConfig": "보안 설정",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "암호화 방법 선택",
       "selectNodeGroup": "노드 그룹 선택",
       "selectProtocol": "프로토콜 선택",
+      "selectRelayMode": "릴레이 모드 선택",
       "serverAddr": "서버 주소",
       "serverName": "서비스 이름",
       "speedLimit": "속도 제한",
diff --git a/apps/admin/locales/no-NO/server.json b/apps/admin/locales/no-NO/server.json
index 21aaa88..1e93977 100644
--- a/apps/admin/locales/no-NO/server.json
+++ b/apps/admin/locales/no-NO/server.json
@@ -49,7 +49,6 @@
       "confirm": "Bekreft",
       "edit": "Rediger",
       "editSecurity": "Rediger sikkerhetskonfigurasjon",
-      "enableRelay": "Aktiver relé",
       "enableTLS": "Aktiver TLS",
       "encryptionMethod": "Krypteringsmetode",
       "flow": "Flytkontrollalgoritme",
@@ -65,7 +64,14 @@
       "port": "Tjenesteport",
       "protocol": "Protokoll",
       "relayHost": "Reléadresse",
+      "relayMode": "Relémodus",
+      "relayModeOptions": {
+        "all": "Alle",
+        "none": "Ingen",
+        "random": "Tilfeldig"
+      },
       "relayPort": "Reléport",
+      "relayPrefix": "Reléprefiks",
       "remarks": "Merknader",
       "security": "Sikkerhet",
       "securityConfig": "Sikkerhetskonfigurasjon",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Velg krypteringsmetode",
       "selectNodeGroup": "Velg nodegruppe",
       "selectProtocol": "Velg protokoll",
+      "selectRelayMode": "Velg relémodus",
       "serverAddr": "Serveradresse",
       "serverName": "Tjenestenavn",
       "speedLimit": "Hastighetsbegrensning",
diff --git a/apps/admin/locales/pl-PL/server.json b/apps/admin/locales/pl-PL/server.json
index f993263..925c104 100644
--- a/apps/admin/locales/pl-PL/server.json
+++ b/apps/admin/locales/pl-PL/server.json
@@ -49,7 +49,6 @@
       "confirm": "Potwierdź",
       "edit": "Edytuj",
       "editSecurity": "Edytuj konfigurację bezpieczeństwa",
-      "enableRelay": "Włącz przekaźnik",
       "enableTLS": "Włącz TLS",
       "encryptionMethod": "Metoda szyfrowania",
       "flow": "Algorytm kontroli przepływu",
@@ -65,7 +64,14 @@
       "port": "Port serwera",
       "protocol": "Protokół",
       "relayHost": "Adres przekaźnika",
+      "relayMode": "Tryb przekaźnika",
+      "relayModeOptions": {
+        "all": "Wszystkie",
+        "none": "Brak",
+        "random": "Losowy"
+      },
       "relayPort": "Port przekaźnika",
+      "relayPrefix": "Prefiks przekaźnika",
       "remarks": "Uwagi",
       "security": "Bezpieczeństwo",
       "securityConfig": "Konfiguracja bezpieczeństwa",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Wybierz metodę szyfrowania",
       "selectNodeGroup": "Wybierz grupę węzłów",
       "selectProtocol": "Wybierz protokół",
+      "selectRelayMode": "Wybierz tryb przekaźnika",
       "serverAddr": "Adres serwera",
       "serverName": "Nazwa usługi",
       "speedLimit": "Ograniczenie prędkości",
diff --git a/apps/admin/locales/pt-BR/server.json b/apps/admin/locales/pt-BR/server.json
index a27ca83..fb045df 100644
--- a/apps/admin/locales/pt-BR/server.json
+++ b/apps/admin/locales/pt-BR/server.json
@@ -49,7 +49,6 @@
       "confirm": "Confirmar",
       "edit": "Editar",
       "editSecurity": "Editar Configuração de Segurança",
-      "enableRelay": "Habilitar Relay",
       "enableTLS": "Habilitar TLS",
       "encryptionMethod": "Método de Criptografia",
       "flow": "Algoritmo de Controle de Fluxo",
@@ -65,7 +64,14 @@
       "port": "Porta do Servidor",
       "protocol": "Protocolo",
       "relayHost": "Endereço de Relay",
+      "relayMode": "Modo de Retransmissão",
+      "relayModeOptions": {
+        "all": "Todos",
+        "none": "Nenhum",
+        "random": "Aleatório"
+      },
       "relayPort": "Porta de Relay",
+      "relayPrefix": "Prefixo de Retransmissão",
       "remarks": "Observações",
       "security": "Segurança",
       "securityConfig": "Configuração de Segurança",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Selecione o Método de Criptografia",
       "selectNodeGroup": "Selecione o Grupo de Nós",
       "selectProtocol": "Selecione o Protocolo",
+      "selectRelayMode": "Selecionar Modo de Retransmissão",
       "serverAddr": "Endereço do Servidor",
       "serverName": "Nome do Serviço",
       "speedLimit": "Limite de Velocidade",
diff --git a/apps/admin/locales/ro-RO/server.json b/apps/admin/locales/ro-RO/server.json
index 347719f..9b11c65 100644
--- a/apps/admin/locales/ro-RO/server.json
+++ b/apps/admin/locales/ro-RO/server.json
@@ -49,7 +49,6 @@
       "confirm": "Confirmă",
       "edit": "Editează",
       "editSecurity": "Editează configurația de securitate",
-      "enableRelay": "Activează retransmisia",
       "enableTLS": "Activează TLS",
       "encryptionMethod": "Metodă de criptare",
       "flow": "Algoritm de control al fluxului",
@@ -65,7 +64,14 @@
       "port": "Port server",
       "protocol": "Protocol",
       "relayHost": "Adresă retransmisie",
+      "relayMode": "Modul de Releu",
+      "relayModeOptions": {
+        "all": "Toate",
+        "none": "Niciunul",
+        "random": "Aleatoriu"
+      },
       "relayPort": "Port retransmisie",
+      "relayPrefix": "Prefix de Releu",
       "remarks": "Observații",
       "security": "Securitate",
       "securityConfig": "Configurație de securitate",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Selectați metoda de criptare",
       "selectNodeGroup": "Selectați grupul de noduri",
       "selectProtocol": "Selectați protocolul",
+      "selectRelayMode": "Selectați Modul de Releu",
       "serverAddr": "Adresă server",
       "serverName": "Nume serviciu",
       "speedLimit": "Limită de viteză",
diff --git a/apps/admin/locales/ru-RU/server.json b/apps/admin/locales/ru-RU/server.json
index f7c9834..93ddc9d 100644
--- a/apps/admin/locales/ru-RU/server.json
+++ b/apps/admin/locales/ru-RU/server.json
@@ -49,7 +49,6 @@
       "confirm": "Подтвердить",
       "edit": "Редактировать",
       "editSecurity": "Редактировать настройки безопасности",
-      "enableRelay": "Включить реле",
       "enableTLS": "Включить TLS",
       "encryptionMethod": "Метод шифрования",
       "flow": "Алгоритм управления потоком",
@@ -65,7 +64,14 @@
       "port": "Порт сервера",
       "protocol": "Протокол",
       "relayHost": "Адрес реле",
+      "relayMode": "Режим ретрансляции",
+      "relayModeOptions": {
+        "all": "Все",
+        "none": "Нет",
+        "random": "Случайный"
+      },
       "relayPort": "Порт реле",
+      "relayPrefix": "Префикс ретрансляции",
       "remarks": "Примечания",
       "security": "Безопасность",
       "securityConfig": "Настройки безопасности",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Выберите метод шифрования",
       "selectNodeGroup": "Выберите группу узлов",
       "selectProtocol": "Выберите протокол",
+      "selectRelayMode": "Выберите режим ретрансляции",
       "serverAddr": "Адрес сервера",
       "serverName": "Имя сервера",
       "speedLimit": "Ограничение скорости",
diff --git a/apps/admin/locales/th-TH/server.json b/apps/admin/locales/th-TH/server.json
index ffc0cb5..85383f9 100644
--- a/apps/admin/locales/th-TH/server.json
+++ b/apps/admin/locales/th-TH/server.json
@@ -49,7 +49,6 @@
       "confirm": "ยืนยัน",
       "edit": "แก้ไข",
       "editSecurity": "แก้ไขการตั้งค่าความปลอดภัย",
-      "enableRelay": "เปิดใช้งานรีเลย์",
       "enableTLS": "เปิดใช้งานTLS",
       "encryptionMethod": "วิธีการเข้ารหัส",
       "flow": "อัลกอริทึมควบคุมการไหล",
@@ -65,7 +64,14 @@
       "port": "พอร์ตบริการ",
       "protocol": "โปรโตคอล",
       "relayHost": "ที่อยู่รีเลย์",
+      "relayMode": "โหมดรีเลย์",
+      "relayModeOptions": {
+        "all": "ทั้งหมด",
+        "none": "ไม่มี",
+        "random": "สุ่ม"
+      },
       "relayPort": "พอร์ตรรีเลย์",
+      "relayPrefix": "คำนำหน้ารีเลย์",
       "remarks": "หมายเหตุ",
       "security": "ความปลอดภัย",
       "securityConfig": "การตั้งค่าความปลอดภัย",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "เลือกวิธีการเข้ารหัส",
       "selectNodeGroup": "เลือกกลุ่มโหนด",
       "selectProtocol": "เลือกโปรโตคอล",
+      "selectRelayMode": "เลือกโหมดรีเลย์",
       "serverAddr": "ที่อยู่เซิร์ฟเวอร์",
       "serverName": "ชื่อบริการ",
       "speedLimit": "จำกัดความเร็ว",
diff --git a/apps/admin/locales/tr-TR/server.json b/apps/admin/locales/tr-TR/server.json
index d9f34df..765bbe7 100644
--- a/apps/admin/locales/tr-TR/server.json
+++ b/apps/admin/locales/tr-TR/server.json
@@ -49,7 +49,6 @@
       "confirm": "Onayla",
       "edit": "Düzenle",
       "editSecurity": "Güvenlik Ayarlarını Düzenle",
-      "enableRelay": "Röleyi Etkinleştir",
       "enableTLS": "TLS'i Etkinleştir",
       "encryptionMethod": "Şifreleme Yöntemi",
       "flow": "Akış Kontrol Algoritması",
@@ -65,7 +64,14 @@
       "port": "Sunucu Portu",
       "protocol": "Protokol",
       "relayHost": "Röle Adresi",
+      "relayMode": "Röle Modu",
+      "relayModeOptions": {
+        "all": "Tümü",
+        "none": "Hiçbiri",
+        "random": "Rastgele"
+      },
       "relayPort": "Röle Portu",
+      "relayPrefix": "Röle Öneki",
       "remarks": "Açıklamalar",
       "security": "Güvenlik",
       "securityConfig": "Güvenlik Ayarları",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Şifreleme Yöntemi Seç",
       "selectNodeGroup": "Düğüm Grubu Seç",
       "selectProtocol": "Protokol Seç",
+      "selectRelayMode": "Röle Modunu Seçin",
       "serverAddr": "Sunucu Adresi",
       "serverName": "Sunucu Adı",
       "speedLimit": "Hız Sınırı",
diff --git a/apps/admin/locales/uk-UA/server.json b/apps/admin/locales/uk-UA/server.json
index 8849553..7103dd4 100644
--- a/apps/admin/locales/uk-UA/server.json
+++ b/apps/admin/locales/uk-UA/server.json
@@ -49,7 +49,6 @@
       "confirm": "Підтвердити",
       "edit": "Редагувати",
       "editSecurity": "Редагувати налаштування безпеки",
-      "enableRelay": "Увімкнути реле",
       "enableTLS": "Увімкнути TLS",
       "encryptionMethod": "Метод шифрування",
       "flow": "Алгоритм контролю потоку",
@@ -65,7 +64,14 @@
       "port": "Порт сервера",
       "protocol": "Протокол",
       "relayHost": "Адреса реле",
+      "relayMode": "Режим ретрансляції",
+      "relayModeOptions": {
+        "all": "Всі",
+        "none": "Немає",
+        "random": "Випадковий"
+      },
       "relayPort": "Порт реле",
+      "relayPrefix": "Префікс ретрансляції",
       "remarks": "Примітки",
       "security": "Безпека",
       "securityConfig": "Налаштування безпеки",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Виберіть метод шифрування",
       "selectNodeGroup": "Виберіть групу вузлів",
       "selectProtocol": "Виберіть протокол",
+      "selectRelayMode": "Виберіть режим ретрансляції",
       "serverAddr": "Адреса сервера",
       "serverName": "Назва сервісу",
       "speedLimit": "Обмеження швидкості",
diff --git a/apps/admin/locales/vi-VN/server.json b/apps/admin/locales/vi-VN/server.json
index 2b8b37d..63e62d9 100644
--- a/apps/admin/locales/vi-VN/server.json
+++ b/apps/admin/locales/vi-VN/server.json
@@ -49,7 +49,6 @@
       "confirm": "Xác nhận",
       "edit": "Chỉnh sửa",
       "editSecurity": "Chỉnh sửa cấu hình bảo mật",
-      "enableRelay": "Kích hoạt chuyển tiếp",
       "enableTLS": "Kích hoạt TLS",
       "encryptionMethod": "Phương pháp mã hóa",
       "flow": "Thuật toán điều khiển luồng",
@@ -65,7 +64,14 @@
       "port": "Cổng dịch vụ",
       "protocol": "Giao thức",
       "relayHost": "Địa chỉ chuyển tiếp",
+      "relayMode": "Chế Độ Tiếp Sức",
+      "relayModeOptions": {
+        "all": "Tất Cả",
+        "none": "Không Có",
+        "random": "Ngẫu Nhiên"
+      },
       "relayPort": "Cổng chuyển tiếp",
+      "relayPrefix": "Tiền Tố Tiếp Sức",
       "remarks": "Ghi chú",
       "security": "Bảo mật",
       "securityConfig": "Cấu hình bảo mật",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "Chọn phương pháp mã hóa",
       "selectNodeGroup": "Chọn nhóm nút",
       "selectProtocol": "Chọn giao thức",
+      "selectRelayMode": "Chọn Chế Độ Tiếp Sức",
       "serverAddr": "Địa chỉ máy chủ",
       "serverName": "Tên dịch vụ",
       "speedLimit": "Giới hạn tốc độ",
diff --git a/apps/admin/locales/zh-CN/server.json b/apps/admin/locales/zh-CN/server.json
index 93db83e..637b8c5 100644
--- a/apps/admin/locales/zh-CN/server.json
+++ b/apps/admin/locales/zh-CN/server.json
@@ -49,7 +49,6 @@
       "confirm": "确认",
       "edit": "编辑",
       "editSecurity": "编辑安全性配置",
-      "enableRelay": "启用中转",
       "enableTLS": "启用TLS",
       "encryptionMethod": "加密方法",
       "flow": "流控算法",
@@ -65,7 +64,14 @@
       "port": "服务端口",
       "protocol": "协议",
       "relayHost": "中转地址",
+      "relayMode": "中转模式",
+      "relayModeOptions": {
+        "all": "全部",
+        "none": "无",
+        "random": "随机"
+      },
       "relayPort": "中转端口",
+      "relayPrefix": "中转前缀",
       "remarks": "备注",
       "security": "安全性",
       "securityConfig": "安全性配置",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "选择加密方法",
       "selectNodeGroup": "选择节点组",
       "selectProtocol": "选择协议",
+      "selectRelayMode": "选择中继模式",
       "serverAddr": "服务器地址",
       "serverName": "服务名称",
       "speedLimit": "速度限制",
diff --git a/apps/admin/locales/zh-HK/server.json b/apps/admin/locales/zh-HK/server.json
index 6aaee86..817d7a7 100644
--- a/apps/admin/locales/zh-HK/server.json
+++ b/apps/admin/locales/zh-HK/server.json
@@ -49,7 +49,6 @@
       "confirm": "確認",
       "edit": "編輯",
       "editSecurity": "編輯安全性配置",
-      "enableRelay": "啟用中繼",
       "enableTLS": "啟用TLS",
       "encryptionMethod": "加密方法",
       "flow": "流控算法",
@@ -65,7 +64,14 @@
       "port": "服務端口",
       "protocol": "協議",
       "relayHost": "中繼地址",
+      "relayMode": "中繼模式",
+      "relayModeOptions": {
+        "all": "全部",
+        "none": "無",
+        "random": "隨機"
+      },
       "relayPort": "中繼端口",
+      "relayPrefix": "中繼前綴",
       "remarks": "備註",
       "security": "安全性",
       "securityConfig": "安全性配置",
@@ -88,6 +94,7 @@
       "selectEncryptionMethod": "選擇加密方法",
       "selectNodeGroup": "選擇節點組",
       "selectProtocol": "選擇協議",
+      "selectRelayMode": "選擇中繼模式",
       "serverAddr": "伺服器地址",
       "serverName": "服務名稱",
       "speedLimit": "速度限制",
diff --git a/apps/admin/services/admin/typings.d.ts b/apps/admin/services/admin/typings.d.ts
index 3d9d0aa..65a3870 100644
--- a/apps/admin/services/admin/typings.d.ts
+++ b/apps/admin/services/admin/typings.d.ts
@@ -122,9 +122,8 @@ declare namespace API {
   type CreateNodeRequest = {
     name: string;
     server_addr: string;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
+    relay_mode: string;
+    relay_node: NodeRelay[];
     speed_limit: number;
     traffic_ratio: number;
     group_id: number;
@@ -520,6 +519,12 @@ declare namespace API {
     node_push_interval: number;
   };
 
+  type NodeRelay = {
+    host: string;
+    port: number;
+    prefix: string;
+  };
+
   type NodeSortRequest = {
     sort: SortItem[];
   };
@@ -608,6 +613,11 @@ declare namespace API {
     ip_register_limit_duration: number;
   };
 
+  type RelayConfig = {
+    dispatch_mode: string;
+    relay_nodes: NodeRelay[];
+  };
+
   type Response = {
     /** 状态码 */
     code?: number;
@@ -638,9 +648,8 @@ declare namespace API {
     id: number;
     name: string;
     server_addr: string;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
+    relay_mode: string;
+    relay_node: NodeRelay[];
     speed_limit: number;
     traffic_ratio: number;
     group_id: number;
@@ -910,9 +919,8 @@ declare namespace API {
     id: number;
     name: string;
     server_addr: string;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
+    relay_mode: string;
+    relay_node: NodeRelay[];
     speed_limit: number;
     traffic_ratio: number;
     group_id: number;
diff --git a/apps/admin/services/common/typings.d.ts b/apps/admin/services/common/typings.d.ts
index 8d8023e..4c49d7d 100644
--- a/apps/admin/services/common/typings.d.ts
+++ b/apps/admin/services/common/typings.d.ts
@@ -140,6 +140,12 @@ declare namespace API {
     node_push_interval: number;
   };
 
+  type NodeRelay = {
+    host: string;
+    port: number;
+    prefix: string;
+  };
+
   type NodeStatus = {
     online_users: OnlineUser[];
     status: ServerStatus;
@@ -216,6 +222,11 @@ declare namespace API {
     ip_register_limit_duration: number;
   };
 
+  type RelayConfig = {
+    dispatch_mode: string;
+    relay_nodes: NodeRelay[];
+  };
+
   type ResetPasswordRequest = {
     email: string;
     password: string;
@@ -256,9 +267,8 @@ declare namespace API {
     id: number;
     name: string;
     server_addr: string;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
+    relay_mode: string;
+    relay_node: NodeRelay[];
     speed_limit: number;
     traffic_ratio: number;
     group_id: number;
diff --git a/apps/user/services/common/typings.d.ts b/apps/user/services/common/typings.d.ts
index 8d8023e..4c49d7d 100644
--- a/apps/user/services/common/typings.d.ts
+++ b/apps/user/services/common/typings.d.ts
@@ -140,6 +140,12 @@ declare namespace API {
     node_push_interval: number;
   };
 
+  type NodeRelay = {
+    host: string;
+    port: number;
+    prefix: string;
+  };
+
   type NodeStatus = {
     online_users: OnlineUser[];
     status: ServerStatus;
@@ -216,6 +222,11 @@ declare namespace API {
     ip_register_limit_duration: number;
   };
 
+  type RelayConfig = {
+    dispatch_mode: string;
+    relay_nodes: NodeRelay[];
+  };
+
   type ResetPasswordRequest = {
     email: string;
     password: string;
@@ -256,9 +267,8 @@ declare namespace API {
     id: number;
     name: string;
     server_addr: string;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
+    relay_mode: string;
+    relay_node: NodeRelay[];
     speed_limit: number;
     traffic_ratio: number;
     group_id: number;
diff --git a/apps/user/services/user/typings.d.ts b/apps/user/services/user/typings.d.ts
index 55e2ec3..9ad5dd9 100644
--- a/apps/user/services/user/typings.d.ts
+++ b/apps/user/services/user/typings.d.ts
@@ -162,6 +162,12 @@ declare namespace API {
     node_push_interval: number;
   };
 
+  type NodeRelay = {
+    host: string;
+    port: number;
+    prefix: string;
+  };
+
   type NodeStatus = {
     online_users: OnlineUser[];
     status: ServerStatus;
@@ -352,6 +358,11 @@ declare namespace API {
     ip_register_limit_duration: number;
   };
 
+  type RelayConfig = {
+    dispatch_mode: string;
+    relay_nodes: NodeRelay[];
+  };
+
   type RenewalOrderRequest = {
     subscribe_id: number;
     quantity: number;
@@ -398,9 +409,8 @@ declare namespace API {
     id: number;
     name: string;
     server_addr: string;
-    enable_relay: boolean;
-    relay_host: string;
-    relay_port: number;
+    relay_mode: string;
+    relay_node: NodeRelay[];
     speed_limit: number;
     traffic_ratio: number;
     group_id: number;
diff --git a/packages/ui/src/custom-components/dynamic-Inputs.tsx b/packages/ui/src/custom-components/dynamic-Inputs.tsx
index 04a43a6..dd705b2 100644
--- a/packages/ui/src/custom-components/dynamic-Inputs.tsx
+++ b/packages/ui/src/custom-components/dynamic-Inputs.tsx
@@ -1,6 +1,7 @@
 import { Button } from '@workspace/ui/components/button';
 import { Combobox } from '@workspace/ui/custom-components/combobox';
 import { EnhancedInput, EnhancedInputProps } from '@workspace/ui/custom-components/enhanced-input';
+import { cn } from '@workspace/ui/lib/utils';
 import { CircleMinusIcon, CirclePlusIcon } from 'lucide-react';
 import { useEffect, useState } from 'react';
 
@@ -54,8 +55,8 @@ export function ObjectInput<T extends Record<string, any>>({
 
   return (
     <div className='flex flex-1 flex-wrap gap-4'>
-      {fields.map(({ name, type, options, ...fieldProps }) => (
-        <div key={name} className='flex-1'>
+      {fields.map(({ name, type, options, className, ...fieldProps }) => (
+        <div key={name} className={cn('flex-1', className)}>
           {type === 'select' && options ? (
             <Combobox<string, false>
               placeholder={fieldProps.placeholder}
diff --git a/packages/ui/src/custom-components/enhanced-input.tsx b/packages/ui/src/custom-components/enhanced-input.tsx
index 2a6bcdc..6ae90b2 100644
--- a/packages/ui/src/custom-components/enhanced-input.tsx
+++ b/packages/ui/src/custom-components/enhanced-input.tsx
@@ -77,7 +77,9 @@ export function EnhancedInput({
       suppressHydrationWarning
     >
       {prefix && (
-        <div className='bg-muted mr-px flex h-9 items-center text-nowrap px-3'>{prefix}</div>
+        <div className='bg-muted relative mr-px flex h-9 items-center text-nowrap px-3'>
+          {prefix}
+        </div>
       )}
       <Input
         {...props}
@@ -87,7 +89,9 @@ export function EnhancedInput({
         onBlur={handleBlur}
       />
       {suffix && (
-        <div className='bg-muted ml-px flex h-9 items-center text-nowrap px-3'>{suffix}</div>
+        <div className='bg-muted relative ml-px flex h-9 items-center text-nowrap px-3'>
+          {suffix}
+        </div>
       )}
     </div>
   );