diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
index 57f686f22eb8ad8a6b992a7b0d8b677903c9dd59..241428a09f26fa54686669820f61f179d7383edf 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
@@ -259,7 +259,7 @@
     },
     {
       "backplane_bps": 14400000000,
-      "kind": "virtual",
+      "kind": "node",
       "model": "J9538A",
       "naming_pattern": "%LINECARD:F%%PORT%",
       "ports": [
@@ -279,10 +279,12 @@
           "uid": "graphite-4"
         },
         {
+          "kind": "virtual",
           "uid": "srv"
         },
         {
-          "uid": "srv-data"
+          "kind": "virtual",
+          "uid": "srv"
         }
       ],
       "rate": 10000000000,
diff --git a/generators/input/sites/nancy/net-links/gw-nancy.yaml b/generators/input/sites/nancy/net-links/gw-nancy.yaml
index 1bf3b07fda2a6a1db8bb44b2f4ad5db61b459293..193dfad497487e742ba69c7ed94b4dd0b621fe83 100644
--- a/generators/input/sites/nancy/net-links/gw-nancy.yaml
+++ b/generators/input/sites/nancy/net-links/gw-nancy.yaml
@@ -204,15 +204,19 @@ gw-nancy:
       snmp_pattern: "F%PORT%"
       backplane_bps: 14400000000
       model: J9538A
-      kind: virtual
+      kind: node
       rate: 10000000000
       ports:
         1: graphite-1
         2: graphite-2
         3: graphite-3
         4: graphite-4
-        5: srv
-        6: srv-data
+        5:
+          uid: srv
+          kind: virtual
+        6:
+          uid: srv
+          kind: virtual
   channels:
     naming_pattern: Po%CHANNELID%
     snmp_pattern: Trk%CHANNELID%