diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
index 5ccf58f46159dac07e0873c06a4f788ec3298271..bcdefee030728abb3961bc4fc9fc0a78c93a2101 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
@@ -36,8 +36,8 @@
       "mounted": true,
       "network_address": "graphite-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw",
+      "switch_port": "F1",
       "vendor": "intel",
       "version": "82599EB"
     },
@@ -94,8 +94,8 @@
       "mounted": false,
       "network_address": "graphite-1-bmc.nancy.grid5000.fr",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgraphene3-ipmi",
+      "switch_port": "1/0/41",
       "vendor": "DELL",
       "version": "IDRAC7"
     }
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
index 7c572d85c4ef42401c0e4a31385eed135be02593..4c0b7c98d59e00105d8c3a175cac3dbfd738cacd 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
@@ -36,8 +36,8 @@
       "mounted": true,
       "network_address": "graphite-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw",
+      "switch_port": "F2",
       "vendor": "intel",
       "version": "82599EB"
     },
@@ -94,8 +94,8 @@
       "mounted": false,
       "network_address": "graphite-2-bmc.nancy.grid5000.fr",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgraphene3-ipmi",
+      "switch_port": "1/0/43",
       "vendor": "DELL",
       "version": "IDRAC7"
     }
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
index e97965e2d173555fe56aa1c6876264ea1d9e9242..ae52e600d8950659f1f177b88ae00090211933d3 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
@@ -36,8 +36,8 @@
       "mounted": true,
       "network_address": "graphite-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw",
+      "switch_port": "F3",
       "vendor": "intel",
       "version": "82599EB"
     },
@@ -94,8 +94,8 @@
       "mounted": false,
       "network_address": "graphite-3-bmc.nancy.grid5000.fr",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgraphene3-ipmi",
+      "switch_port": "1/0/45",
       "vendor": "DELL",
       "version": "IDRAC7"
     }
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
index 1b36d140cf97b7cec2f43693ff2e843badf970ac..6159a6677943e9ff8238d2150be8bebc7cf805a9 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
@@ -36,8 +36,8 @@
       "mounted": true,
       "network_address": "graphite-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw",
+      "switch_port": "F4",
       "vendor": "intel",
       "version": "82599EB"
     },
@@ -94,8 +94,8 @@
       "mounted": false,
       "network_address": "graphite-4-bmc.nancy.grid5000.fr",
       "rate": 100000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgraphene3-ipmi",
+      "switch_port": "1/0/47",
       "vendor": "DELL",
       "version": "IDRAC7"
     }
diff --git a/generators/input/sites/nancy/clusters/graphite_manual.yaml b/generators/input/sites/nancy/clusters/graphite_manual.yaml
index 73ee4c20777e7b087f6d16405f7adb44c5839bd3..f5f4b3248288750db5c630db4a313cfb7f008923 100644
--- a/generators/input/sites/nancy/clusters/graphite_manual.yaml
+++ b/generators/input/sites/nancy/clusters/graphite_manual.yaml
@@ -1,8 +1,8 @@
 ---
-graphene-1:
+graphite-1:
   network_interfaces:
     eth0:
-      switch_name: sgravillon1
+      switch_name: gw
       switch_port: F1
     bmc:
       switch_name: sgraphene3-ipmi
@@ -10,10 +10,10 @@ graphene-1:
   pdu:
     pdu_name: graphene-pdu1.nancy.grid5000.fr
     pdu_position: 2
-graphene-2:
+graphite-2:
   network_interfaces:
     eth0:
-      switch_name: sgravillon1
+      switch_name: gw
       switch_port: F2
     bmc:
       switch_name: sgraphene3-ipmi
@@ -21,10 +21,10 @@ graphene-2:
   pdu:
     pdu_name: graphene-pdu1.nancy.grid5000.fr
     pdu_position: 3
-graphene-3:
+graphite-3:
   network_interfaces:
     eth0:
-      switch_name: sgravillon1
+      switch_name: gw
       switch_port: F3
     bmc:
       switch_name: sgraphene3-ipmi
@@ -32,10 +32,10 @@ graphene-3:
   pdu:
     pdu_name: graphene-pdu1.nancy.grid5000.fr
     pdu_position: 4
-graphene-4:
+graphite-4:
   network_interfaces:
     eth0:
-      switch_name: sgravillon1
+      switch_name: gw
       switch_port: F4
     bmc:
       switch_name: sgraphene3-ipmi