diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse4/nodes/chartreuse4-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse4/nodes/chartreuse4-1.json
index df8e4fb23b662d63dffb10c418fc1d043de5535d..a1828eb2bfeeaf28485dba6c0730b98bdb5dd90a 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse4/nodes/chartreuse4-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse4/nodes/chartreuse4-1.json
@@ -51,8 +51,8 @@
       "name": "enp1s0f0np0",
       "network_address": "chartreuse4-1.grenoble.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null
+      "switch": "imag-1b-F3-prod-01",
+      "switch_port": "1/1/16"
     },
     {
       "device": "bmc",
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json
index 2765c5ef7dd5c39c239666485ad4b5d53d1d5e5f..9c28f93a92b5f79ae85e682fea931dbf6787fad8 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json
@@ -37,12 +37,24 @@
         {
         },
         {
+          "kind": "other",
+          "snmp_name": "1/1/13",
+          "uid": "chartreuse4-1-bmc"
         },
         {
+          "kind": "other",
+          "snmp_name": "1/1/14",
+          "uid": "chartreuse4-2-bmc"
         },
         {
+          "kind": "other",
+          "snmp_name": "1/1/15",
+          "uid": "chartreuse4-3-bmc"
         },
         {
+          "kind": "other",
+          "snmp_name": "1/1/16",
+          "uid": "chartreuse4-4-bmc"
         },
         {
         },
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
index e20fdc6efe5041bd41a13bdc0754f0eab6ed79c1..e486b434c53fdf516c0e238d5716697b3e0d05de 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
@@ -99,6 +99,11 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 10000000000,
+          "snmp_name": "1/1/16",
+          "uid": "chartreuse4-1"
         },
         {
         },
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml
index 97cbe6f756eab3bb24b000df935b1fb1cc0e3570..714b99da2e25efcf20d8baab3b16f0e3767c9e7a 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml
@@ -22,6 +22,18 @@ imag-1b-F3-admin-01:
         #40:
         #  uid: imag-1b-F3-prod-01-mgmt
         #  kind: switch
+        13:
+          uid: chartreuse4-1-bmc
+          kind: other
+        14:
+          uid: chartreuse4-2-bmc
+          kind: other
+        15:
+          uid: chartreuse4-3-bmc
+          kind: other
+        16:
+          uid: chartreuse4-4-bmc
+          kind: other
         48:
           uid: imag-1b-F3-prod-01
           kind: switch
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
index 744e97bbd894e27ff55c68258a520628fbcb354a..73562a4df474c1a20560b87f4446159166b7d2d0 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
@@ -47,6 +47,9 @@ imag-1b-F3-prod-01:
         12:
           uid: chartreuse3-1
           rate: 10_000_000_000
+        16:
+          uid: chartreuse4-1
+          rate: 10_000_000_000
         22:
           uid: nessie-1
         39: