diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto
index 864b4b12..4f6b9a98 100644
--- a/meshtastic/deviceonly.proto
+++ b/meshtastic/deviceonly.proto
@@ -7,7 +7,6 @@ import "meshtastic/localonly.proto";
 import "meshtastic/mesh.proto";
 import "meshtastic/telemetry.proto";
 import "meshtastic/module_config.proto";
-import "meshtastic/config.proto";
 
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
@@ -117,11 +116,6 @@ message NodeInfoLite {
    * local channel index we heard that node on. Only populated if its not the default channel.
    */
   uint32 channel = 7;
-
-  /*
-   * Indicates that the device's role in the mesh
-   */
-  Config.DeviceConfig.Role role = 8;
 }
 
 /*
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index 4d7542cb..6a73ee33 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -512,6 +512,11 @@ message User {
    * Also, "long_name" should be their licence number.
    */
   bool is_licensed = 6;
+
+  /*
+   * Indicates that the user's role in the mesh
+   */
+  Config.DeviceConfig.Role role = 7;
 }
 
 /*
@@ -1046,11 +1051,6 @@ message NodeInfo {
    * local channel index we heard that node on. Only populated if its not the default channel.
    */
   uint32 channel = 7;
-
-  /*
-   * Indicates that the device's role in the mesh
-   */
-  Config.DeviceConfig.Role role = 8;
 }
 
 /*