diff --git a/src/types/schemas/configs.schemas.ts b/src/types/schemas/configs.schemas.ts
index 0036c30c8..0d7782e04 100644
--- a/src/types/schemas/configs.schemas.ts
+++ b/src/types/schemas/configs.schemas.ts
@@ -494,6 +494,8 @@ export type EmqxMqttMaxAwaitingRel = 'infinity' | number
 
 export type EmqxMqttMessageExpiryInterval = 'infinity' | string
 
+export type EmqxMqttClientidOverride = string | 'disabled'
+
 export type EmqxMqttPeerCertAsClientid =
   typeof EmqxMqttPeerCertAsClientid[keyof typeof EmqxMqttPeerCertAsClientid]
 
@@ -574,6 +576,7 @@ export interface EmqxMqtt {
   peer_cert_as_username?: EmqxMqttPeerCertAsUsername
   peer_cert_as_clientid?: EmqxMqttPeerCertAsClientid
   client_attrs_init?: EmqxClientAttrsInit[]
+  clientid_override?: EmqxMqttClientidOverride
   session_expiry_interval?: string
   message_expiry_interval?: EmqxMqttMessageExpiryInterval
   max_awaiting_rel?: EmqxMqttMaxAwaitingRel
diff --git a/src/types/schemas/gatewayListeners.schemas.ts b/src/types/schemas/gatewayListeners.schemas.ts
index e97824746..e8a039eca 100644
--- a/src/types/schemas/gatewayListeners.schemas.ts
+++ b/src/types/schemas/gatewayListeners.schemas.ts
@@ -690,6 +690,7 @@ export interface EmqxTcpOpts {
   buffer?: string
   high_watermark?: string
   nodelay?: boolean
+  nolinger?: boolean
   reuseaddr?: boolean
   keepalive?: string
 }
diff --git a/src/types/schemas/gateways.schemas.ts b/src/types/schemas/gateways.schemas.ts
index 6ef83128b..50142bcd6 100644
--- a/src/types/schemas/gateways.schemas.ts
+++ b/src/types/schemas/gateways.schemas.ts
@@ -253,6 +253,7 @@ export interface EmqxTcpOpts {
   buffer?: string
   high_watermark?: string
   nodelay?: boolean
+  nolinger?: boolean
   reuseaddr?: boolean
   keepalive?: string
 }
diff --git a/src/types/schemas/listeners.schemas.ts b/src/types/schemas/listeners.schemas.ts
index a55a74900..d10405b72 100644
--- a/src/types/schemas/listeners.schemas.ts
+++ b/src/types/schemas/listeners.schemas.ts
@@ -857,6 +857,7 @@ export interface EmqxTcpOpts {
   buffer?: string
   high_watermark?: string
   nodelay?: boolean
+  nolinger?: boolean
   reuseaddr?: boolean
   keepalive?: string
 }