diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index 3bc98375..8c50965f 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1056,10 +1056,11 @@ message MyNodeInfo {
   uint32 my_node_num = 1;
 
   /*
+   * Deprecated in 2.1.x (Source from device_metadata)
    * Note: This flag merely means we detected a hardware GPS in our node.
    * Not the same as UserPreferences.location_sharing
    */
-  bool has_gps = 2;
+  bool has_gps = 2 [deprecated = true];
 
   /*
    * Deprecated in 2.1.x
@@ -1068,9 +1069,10 @@ message MyNodeInfo {
   uint32 max_channels = 3 [deprecated = true];
 
   /*
+   * Deprecated in 2.1.x (Source from device_metadata)
    * 0.0.5 etc...
    */
-  string firmware_version = 4;
+  string firmware_version = 4 [deprecated = true];
 
   /*
    * An error message we'd like to report back to the mothership through analytics.
@@ -1080,18 +1082,18 @@ message MyNodeInfo {
    * (i.e. it will only be reported once)
    * a numeric error code to go with error message, zero means no error
    */
-  CriticalErrorCode error_code = 5;
+  CriticalErrorCode error_code = 5 [deprecated = true];
 
   /*
    * A numeric error address (nonzero if available)
    */
-  uint32 error_address = 6;
+  uint32 error_address = 6 [deprecated = true];
 
   /*
    * The total number of errors this node has ever encountered
    * (well - since the last time we discarded preferences)
    */
-  uint32 error_count = 7;
+  uint32 error_count = 7 [deprecated = true];
 
   /*
    * The total number of reboots this node has ever encountered
@@ -1100,9 +1102,10 @@ message MyNodeInfo {
   uint32 reboot_count = 8;
 
   /*
+   * Deprecated in 2.1.x
    * Calculated bitrate of the current channel (in Bytes Per Second)
    */
-  float bitrate = 9;
+  float bitrate = 9 [deprecated = true];
 
   /*
    * Deprecated in 2.1.x