diff --git a/services/arbiter-3.0/src/panel/discovery.js b/services/arbiter-3.0/src/panel/discovery.js
index 525cc94..e2208db 100644
--- a/services/arbiter-3.0/src/panel/discovery.js
+++ b/services/arbiter-3.0/src/panel/discovery.js
@@ -19,12 +19,20 @@ async function getMinecraftServers() {
     // Parse the allowed nest IDs from the environment variable
     const allowedNests = process.env.MINECRAFT_NEST_IDS.split(',').map(id => parseInt(id.trim(), 10));
     
+    // Node ID to friendly name mapping
+    const nodeMap = {
+      2: 'NC1',
+      3: 'TX1'
+    };
+
     return data.data.filter(server => {
       // The API returns the nest ID directly as an integer when relationships aren't included
       return allowedNests.includes(server.attributes.nest);
     }).map(server => ({
       identifier: server.attributes.identifier,
-      name: server.attributes.name
+      name: server.attributes.name,
+      nodeId: server.attributes.node,
+      node: nodeMap[server.attributes.node] || `Node ${server.attributes.node}`
     }));
   } catch (error) {
     console.error("Discovery failed:", error);
diff --git a/services/arbiter-3.0/src/routes/admin/servers.js b/services/arbiter-3.0/src/routes/admin/servers.js
index ba88651..2f0f9b5 100644
--- a/services/arbiter-3.0/src/routes/admin/servers.js
+++ b/services/arbiter-3.0/src/routes/admin/servers.js
@@ -44,8 +44,8 @@ router.get('/matrix', async (req, res) => {
     }));
 
     // Group by Node Location
-    const txServers = enrichedServers.filter(s => s.node === 'TX1' || s.node === 'Node 3' || s.name.includes('TX'));
-    const ncServers = enrichedServers.filter(s => s.node === 'NC1' || s.node === 'Node 2' || s.name.includes('NC'));
+    const txServers = enrichedServers.filter(s => s.node === 'TX1');
+    const ncServers = enrichedServers.filter(s => s.node === 'NC1');
 
     res.render('admin/servers/_matrix_body', { txServers, ncServers, layout: false });
 });