diff --git a/contrib/seed/ipnet/node_tags.yaml b/contrib/seed/ipnet/node_tags.yaml
index 03ef582..328fd47 100644
--- a/contrib/seed/ipnet/node_tags.yaml
+++ b/contrib/seed/ipnet/node_tags.yaml
@@ -13,11 +13,7 @@
   hardware: Heltec V3
   antenna: Paradar 8.5dBi Omni
   elevation: 31
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 8cb01fff1afc099055af418ce5fc5e60384df9ff763c25dd7e6a5e0922e8df90:
   friendly_name: IP2 Repeater 2
@@ -30,11 +26,7 @@
   hardware: Heltec V3
   antenna: McGill 6dBi Omni
   elevation: 44
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 5b565df747913358e24d890b2227de9c35d09763746b6ec326c15ebbf9b8be3b:
   friendly_name: IP2 Repeater 3
@@ -47,11 +39,7 @@
   hardware: Heltec V3
   antenna: Paradar 8.5dBi Omni
   elevation: 52
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 780d0939f90b22d3bd7cbedcaf4e8d468a12c01886ab24b8cfa11eab2f5516c5:
   friendly_name: IP2 Integration 1
@@ -64,11 +52,7 @@
   hardware: Heltec V3
   antenna: Generic 5dBi Whip
   elevation: 25
-  show_on_map: false
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: integration
+  role: infra
 
 30121dc60362c633c457ffa18f49b3e1d6823402c33709f32d7df70612250b96:
   friendly_name: MeshBot
@@ -81,11 +65,7 @@
   hardware: Heltec V3
   antenna: Generic 5dBi Whip
   elevation: 25
-  show_on_map: false
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: integration
+  role: infra
 
 # IP3 Area Nodes
 9135986b83815ada92883358435cc6528c7db60cb647f9b6547739a1ce5eb1c8:
@@ -99,11 +79,7 @@
   hardware: Heltec V3
   antenna: Paradar 8.5dBi Omni
   elevation: 42
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 e334ec5475789d542ed9e692fbeef7444a371fcc05adcbda1f47ba6a3191b459:
   friendly_name: IP3 Repeater 2
@@ -116,11 +92,7 @@ e334ec5475789d542ed9e692fbeef7444a371fcc05adcbda1f47ba6a3191b459:
   hardware: Heltec T114
   antenna: Unknown
   elevation: 39
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 cc15fb33e98f2e098a543f516f770dc3061a1a6b30f79b84780663bf68ae6b53:
   friendly_name: IP3 Repeater 3
@@ -133,11 +105,7 @@ cc15fb33e98f2e098a543f516f770dc3061a1a6b30f79b84780663bf68ae6b53:
   hardware: Heltec V3
   antenna: Unknown
   elevation: 39
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 22309435fbd9dd1f14870a1895dc854779f6b2af72b08542f6105d264a493ebe:
   friendly_name: IP3 Integration 1
@@ -150,11 +118,7 @@ cc15fb33e98f2e098a543f516f770dc3061a1a6b30f79b84780663bf68ae6b53:
   hardware: Heltec V3
   antenna: Generic 3dBi Whip
   elevation: 37
-  show_on_map: false
-  is_public: true
-  is_online: false
-  is_testing: false
-  mesh_role: integration
+  role: infra
 
 2a4f89e766dfa1758e35a69962c1f6d352b206a5e3562a589155a3ebfe7fc2bb:
   friendly_name: IP3 Repeater 4
@@ -167,11 +131,7 @@ cc15fb33e98f2e098a543f516f770dc3061a1a6b30f79b84780663bf68ae6b53:
   hardware: Sensecap Solar
   antenna: Paradar 6.5dbi Omni
   elevation: 21
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 e790b73b2d6e377dd0f575c847f3ef42232f610eb9a19af57083fc4f647309ac:
   friendly_name: IP3 Repeater 5
@@ -184,11 +144,7 @@ e790b73b2d6e377dd0f575c847f3ef42232f610eb9a19af57083fc4f647309ac:
   hardware: Heltec T114
   antenna: Paradar 6.5dBi Omni
   elevation: 38
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 20ed75ffc0f9777951716bb3d308d7f041fd2ad32fe2e998e600d0361e1fe2ac:
   friendly_name: IP3 Repeater 6
@@ -201,11 +157,7 @@ e790b73b2d6e377dd0f575c847f3ef42232f610eb9a19af57083fc4f647309ac:
   hardware: Unknown
   antenna: Generic 5dBi Whip
   elevation: 38
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 69fb8431e7ab307513797544fab99ce53ce24c46ec2d3a11767fe70f2ca37b23:
   friendly_name: IP3 Test Repeater 1
@@ -218,11 +170,7 @@ e790b73b2d6e377dd0f575c847f3ef42232f610eb9a19af57083fc4f647309ac:
   hardware: Station G2
   antenna: McGill 10dBi Panel
   elevation: 37
-  show_on_map: true
-  is_public: true
-  is_online: false
-  is_testing: true
-  mesh_role: repeater
+  role: infra
 
 # IP4 Area Nodes
 d3c20d962f7384c111fbafad6fbc1c1dc0e5c3ce802fb3ee11020e8d8207ed3a:
@@ -236,11 +184,7 @@ d3c20d962f7384c111fbafad6fbc1c1dc0e5c3ce802fb3ee11020e8d8207ed3a:
   hardware: Heltec T114
   antenna: Generic 5dbi Whip
   elevation: 50
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 b00ce9d218203e96d8557a4d59e06f5de59bbc4dcc4df9c870079d2cb8b5bd80:
   friendly_name: IP4 Repeater 2
@@ -253,11 +197,7 @@ b00ce9d218203e96d8557a4d59e06f5de59bbc4dcc4df9c870079d2cb8b5bd80:
   hardware: Heltec V3
   antenna: Paradar 5dbi Whip
   elevation: 35
-  show_on_map: true
-  is_public: true
-  is_online: false
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 8accb6d0189ccaffb745ba54793e7fe3edd515edb45554325d957e48c1b9f3b3:
   friendly_name: IP4 Repeater 3
@@ -270,11 +210,7 @@ b00ce9d218203e96d8557a4d59e06f5de59bbc4dcc4df9c870079d2cb8b5bd80:
   hardware: Heltec v3
   antenna: Generic Whip
   elevation: 30
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 # IP8 Area Nodes
 bd7b5ac75f660675b39f368e1dbb6d1dbcefd8bd7a170e21a942954f67c8bf52:
@@ -288,11 +224,7 @@ bd7b5ac75f660675b39f368e1dbb6d1dbcefd8bd7a170e21a942954f67c8bf52:
   hardware: Heltec V3
   antenna: McGill 3dBi Omni
   elevation: 13
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra
 
 9cf300c40112ea34d0a59858270948b27ab6cd87e840de338f3ca782c17537b2:
   friendly_name: IP8 Repeater 2
@@ -304,8 +236,4 @@ bd7b5ac75f660675b39f368e1dbb6d1dbcefd8bd7a170e21a942954f67c8bf52:
   location_description: Washbrook
   hardware: Sensecap Solar
   elevation: 13
-  show_on_map: true
-  is_public: true
-  is_online: true
-  is_testing: false
-  mesh_role: repeater
+  role: infra