diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto
index 0fbfbe36d..5ecf31020 100644
--- a/meshtastic/admin.proto
+++ b/meshtastic/admin.proto
@@ -162,6 +162,11 @@ message AdminMessage {
      * Traffic management module config
      */
     TRAFFICMANAGEMENT_CONFIG = 14;
+
+    /*
+     * TAK module config
+     */
+    TAK_CONFIG = 15;
   }
 
   enum BackupLocation {
diff --git a/meshtastic/localonly.proto b/meshtastic/localonly.proto
index 50b74f739..2a6c7cacd 100644
--- a/meshtastic/localonly.proto
+++ b/meshtastic/localonly.proto
@@ -141,6 +141,11 @@ message LocalModuleConfig {
    */
   ModuleConfig.TrafficManagementConfig traffic_management = 16;
 
+  /*
+   * TAK Config
+   */
+  ModuleConfig.TAKConfig tak = 17;
+
   /*
    * A version integer used to invalidate old save files when we make
    * incompatible changes This integer is set at build time and is private to
diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto
index a8a4307fe..10753c6c7 100644
--- a/meshtastic/module_config.proto
+++ b/meshtastic/module_config.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package meshtastic;
 
+import "meshtastic/atak.proto";
+
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "ModuleConfigProtos";
@@ -933,6 +935,27 @@ message ModuleConfig {
      * Traffic management module config for mesh network optimization
      */
     TrafficManagementConfig traffic_management = 15;
+
+    /*
+     * TAK team/role configuration for TAK_TRACKER
+     */
+    TAKConfig tak = 16;
+  }
+
+  /*
+   * TAK team/role configuration
+   */
+  message TAKConfig {
+    /*
+     * Team color.
+     * Default Unspecifed_Color -> firmware uses Cyan
+     */
+    Team team = 1;
+    /*
+     * Member role.
+     * Default Unspecifed -> firmware uses TeamMember
+     */
+    MemberRole role = 2;
   }
 }