diff --git a/meshtastic/clientonly.options b/meshtastic/clientonly.options
index c47944a0..2a7c9f80 100644
--- a/meshtastic/clientonly.options
+++ b/meshtastic/clientonly.options
@@ -1,4 +1,4 @@
-*DeviceProfile.long_name max_size:40
+*DeviceProfile.long_name max_size:25
 *DeviceProfile.short_name max_size:5
 *DeviceProfile.ringtone max_size:231
 *DeviceProfile.canned_messages max_size:201
\ No newline at end of file
diff --git a/meshtastic/deviceonly.options b/meshtastic/deviceonly.options
index 21e81276..bf0e4c6b 100644
--- a/meshtastic/deviceonly.options
+++ b/meshtastic/deviceonly.options
@@ -24,7 +24,7 @@
 *NodeInfoLite.hw_model int_size:8
 *NodeInfoLite.role int_size:8
 
-*UserLite.long_name max_size:40
+*UserLite.long_name max_size:25
 *UserLite.short_name max_size:5
 *UserLite.public_key max_size:32 # public key
 *UserLite.macaddr max_size:6 fixed_length:true
\ No newline at end of file
diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index 27fc61f4..17ab237d 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -5,7 +5,7 @@
 *id max_size:16 # node id strings
 *public_key max_size:32 # public key
 
-*User.long_name max_size:40
+*User.long_name max_size:25
 *User.short_name max_size:5
 
 *RouteDiscovery.route max_count:8
diff --git a/meshtastic/mqtt.options b/meshtastic/mqtt.options
index 591e898e..2ab6f018 100644
--- a/meshtastic/mqtt.options
+++ b/meshtastic/mqtt.options
@@ -2,7 +2,7 @@
 *ServiceEnvelope.channel_id type:FT_POINTER
 *ServiceEnvelope.gateway_id type:FT_POINTER
 
-*MapReport.long_name max_size:40
+*MapReport.long_name max_size:25
 *MapReport.short_name max_size:5
 *MapReport.firmware_version max_size:18
 *MapReport.num_online_local_nodes int_size:16
\ No newline at end of file