diff --git a/data/grid5000/sites/luxembourg/clusters/vianden/nodes/vianden-1.json b/data/grid5000/sites/luxembourg/clusters/vianden/nodes/vianden-1.json
index 5685fc7dd65ff1c0f61d60a700db1b442f6db761..2659dd86246dc70036144e180b0616ea99c541c2 100644
--- a/data/grid5000/sites/luxembourg/clusters/vianden/nodes/vianden-1.json
+++ b/data/grid5000/sites/luxembourg/clusters/vianden/nodes/vianden-1.json
@@ -194,41 +194,92 @@
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "bnxt_en",
+      "driver": "mlx5_core",
+      "enabled": true,
+      "firmware_version": "22.41.1000 (DEL0000000027)",
+      "interface": "Ethernet",
+      "ip": "172.16.178.1",
+      "ip6": "2001:660:4406:300:3::1",
+      "kavlan": false,
+      "mac": "b8:e9:24:b2:58:9e",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp158s0f0np0",
+      "network_address": "vianden-1.luxembourg.grid5000.fr",
+      "rate": 100000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-b04",
+      "switch_port": "Ethernet1/52",
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth1",
+      "driver": "mlx5_core",
       "enabled": false,
+      "firmware_version": "22.41.1000 (DEL0000000027)",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "b8:e9:24:b2:58:9f",
+      "management": false,
+      "model": "MT2892 Family [ConnectX-6 Dx]",
+      "mountable": false,
+      "mounted": false,
+      "name": "enp158s0f1np1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "eth2",
+      "driver": "bnxt_en",
+      "enabled": true,
       "firmware_version": "231.0.154.0/pkg 23.11.16.22",
       "interface": "Ethernet",
+      "ip": "172.16.178.2",
+      "ip6": "2001:660:4406:300:3:1:0:1",
       "kavlan": false,
       "mac": "d4:04:e6:c5:88:60",
       "management": false,
       "model": "BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "enp1s0f0np0",
+      "network_address": "vianden-1-eth2.luxembourg.grid5000.fr",
       "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
+      "switch": "sw-b04",
+      "switch_port": "Ethernet1/8",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
-      "device": "eth1",
+      "device": "eth3",
       "driver": "bnxt_en",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "231.0.154.0/pkg 23.11.16.22",
       "interface": "Ethernet",
+      "ip": "172.16.178.3",
+      "ip6": "2001:660:4406:300:3:2:0:1",
       "kavlan": false,
       "mac": "d4:04:e6:c5:88:61",
       "management": false,
       "model": "BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "eno12409np1",
+      "network_address": "vianden-1-eth3.luxembourg.grid5000.fr",
+      "rate": 10000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
+      "switch": "sw-b04",
+      "switch_port": "Ethernet1/9",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
-      "device": "eth2",
+      "device": "eth4",
       "driver": "bnxt_en",
       "enabled": false,
       "firmware_version": "231.0.154.0/pkg 23.11.16.22",
@@ -245,7 +296,7 @@
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
-      "device": "eth3",
+      "device": "eth5",
       "driver": "bnxt_en",
       "enabled": false,
       "firmware_version": "231.0.154.0/pkg 23.11.16.22",
@@ -262,9 +313,9 @@
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
-      "device": "eth4",
+      "device": "eth6",
       "driver": "tg3",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "FFV23.11.4 bc 5720-v1.39",
       "interface": "Ethernet",
       "kavlan": false,
@@ -279,7 +330,7 @@
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
-      "device": "eth5",
+      "device": "eth7",
       "driver": "tg3",
       "enabled": false,
       "firmware_version": "FFV23.11.4 bc 5720-v1.39",
@@ -295,46 +346,6 @@
       "sriov_totalvfs": 0,
       "vendor": "Broadcom Inc. and subsidiaries"
     },
-    {
-      "device": "eth6",
-      "driver": "mlx5_core",
-      "enabled": true,
-      "firmware_version": "22.41.1000 (DEL0000000027)",
-      "interface": "Ethernet",
-      "ip": "172.16.178.1",
-      "ip6": "2001:660:4406:300:3::1",
-      "kavlan": false,
-      "mac": "b8:e9:24:b2:58:9e",
-      "management": false,
-      "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp158s0f0np0",
-      "network_address": "vianden-1.luxembourg.grid5000.fr",
-      "rate": 100000000000,
-      "sriov": false,
-      "sriov_totalvfs": 0,
-      "switch": "sw-b04",
-      "switch_port": "Ethernet1/52",
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "eth7",
-      "driver": "mlx5_core",
-      "enabled": false,
-      "firmware_version": "22.41.1000 (DEL0000000027)",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "b8:e9:24:b2:58:9f",
-      "management": false,
-      "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp158s0f1np1",
-      "sriov": false,
-      "sriov_totalvfs": 0,
-      "vendor": "Mellanox Technologies"
-    },
     {
       "device": "bmc",
       "enabled": true,
diff --git a/data/grid5000/sites/luxembourg/clusters/vianden/vianden.json b/data/grid5000/sites/luxembourg/clusters/vianden/vianden.json
index a8e3b8f51e3c2eb1e744f1bed6d4f8066194154d..76c55c2ec9f0ea6d4c7755474ce3512fcd87a076 100644
--- a/data/grid5000/sites/luxembourg/clusters/vianden/vianden.json
+++ b/data/grid5000/sites/luxembourg/clusters/vianden/vianden.json
@@ -8,7 +8,7 @@
     {
       "description": "Input byte counter for the network device port",
       "labels": {
-        "interface": "eth6"
+        "interface": "eth0"
       },
       "name": "network_ifacein_bytes_total",
       "period": 15000,
@@ -19,7 +19,7 @@
     {
       "description": "Output byte counter for the network device port",
       "labels": {
-        "interface": "eth6"
+        "interface": "eth0"
       },
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
@@ -30,7 +30,7 @@
     {
       "description": "Input packet counter for the network device port",
       "labels": {
-        "interface": "eth6"
+        "interface": "eth0"
       },
       "name": "network_ifacein_packets_total",
       "period": 15000,
@@ -41,7 +41,7 @@
     {
       "description": "Output packet counter for the network device port",
       "labels": {
-        "interface": "eth6"
+        "interface": "eth0"
       },
       "name": "network_ifaceout_packets_total",
       "period": 15000,
@@ -52,7 +52,7 @@
     {
       "description": "Input counter of discarded packets for the network device port",
       "labels": {
-        "interface": "eth6"
+        "interface": "eth0"
       },
       "name": "network_ifacein_packets_discard_total",
       "period": 15000,
@@ -63,7 +63,7 @@
     {
       "description": "Output counter of discarded packets for the network device port",
       "labels": {
-        "interface": "eth6"
+        "interface": "eth0"
       },
       "name": "network_ifaceout_packets_discard_total",
       "period": 15000,
@@ -74,7 +74,7 @@
     {
       "description": "Input counter of packet errors for the network device port",
       "labels": {
-        "interface": "eth6"
+        "interface": "eth0"
       },
       "name": "network_ifacein_packets_error_total",
       "period": 15000,
@@ -85,7 +85,183 @@
     {
       "description": "Output counter of packet errors for the network device port",
       "labels": {
-        "interface": "eth6"
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_error_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifacein_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifaceout_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifacein_packets_discard_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifaceout_packets_discard_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifacein_packets_error_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifaceout_packets_error_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifacein_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifaceout_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifacein_packets_discard_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifaceout_packets_discard_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifacein_packets_error_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth3"
       },
       "name": "network_ifaceout_packets_error_total",
       "period": 15000,
@@ -96,7 +272,7 @@
   ],
   "model": "Dell PowerEdge XE9680",
   "nodes_count": 1,
-  "nodes_description": "2 CPUs Intel Xeon Platinum 8470, 52 cores/CPU, 2048GB RAM, 2980GB SSD, 1 x 100Gb Ethernet",
+  "nodes_description": "2 CPUs Intel Xeon Platinum 8470, 52 cores/CPU, 2048GB RAM, 2980GB SSD, 1 x 100Gb Ethernet, 2 x 10Gb Ethernet",
   "priority": 202407,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/luxembourg/network_equipments/sw-b04.json b/data/grid5000/sites/luxembourg/network_equipments/sw-b04.json
index f680417e26706fca0ade863b610b8be4d83f84f9..738f4748767bb856311f8737d1f5d5c3265b3879 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/sw-b04.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/sw-b04.json
@@ -35,8 +35,18 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth2",
+          "rate": 10000000000,
+          "snmp_name": "Ethernet1/8",
+          "uid": "vianden-1"
         },
         {
+          "kind": "node",
+          "port": "eth3",
+          "rate": 10000000000,
+          "snmp_name": "Ethernet1/9",
+          "uid": "vianden-1"
         },
         {
         },
@@ -124,7 +134,7 @@
         },
         {
           "kind": "node",
-          "port": "eth6",
+          "port": "eth0",
           "rate": 100000000000,
           "snmp_name": "Ethernet1/52",
           "uid": "vianden-1"
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index fe6c369aa9109e8dd51736394013cd39ee35cf4e..75c482fbaea904f177aac0765d7ee70fcbe6f142 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -67,7 +67,9 @@ ipv4:
       lille chuc eth1 0 0 0 100
       luxembourg petitprince eth0 0 0 1 0
       luxembourg petitprince eth1 0 0 1 100
-      luxembourg vianden eth6 0 0 2 0
+      luxembourg vianden eth0 0 0 2 0
+      luxembourg vianden eth2 0 0 2 1
+      luxembourg vianden eth3 0 0 2 2
       lyon sagittaire eth1 0 0 1 0
       lyon taurus eth0 0 0 0 0
       lyon orion eth0 0 0 2 0
diff --git a/input/grid5000/sites/luxembourg/clusters/vianden/nodes/vianden-1.yaml b/input/grid5000/sites/luxembourg/clusters/vianden/nodes/vianden-1.yaml
index 068bd9eb680016a8eea265bea49234dace537bcb..d95554cf8984798aad4a37d9da8309fefef7c243 100644
--- a/input/grid5000/sites/luxembourg/clusters/vianden/nodes/vianden-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/vianden/nodes/vianden-1.yaml
@@ -121,9 +121,34 @@ vianden-1:
       mac: c4:cb:e1:c5:f2:4a
       management: true
     eth0:
+      driver: mlx5_core
+      firmware_version: 22.41.1000 (DEL0000000027)
+      interface: Ethernet
+      ip: 172.16.178.1
+      mac: b8:e9:24:b2:58:9e
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: enp158s0f0np0
+      rate: 100000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Mellanox Technologies
+    eth1:
+      driver: mlx5_core
+      firmware_version: 22.41.1000 (DEL0000000027)
+      interface: Ethernet
+      mac: b8:e9:24:b2:58:9f
+      management: false
+      model: MT2892 Family [ConnectX-6 Dx]
+      name: enp158s0f1np1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Mellanox Technologies
+    eth2:
       driver: bnxt_en
       firmware_version: 231.0.154.0/pkg 23.11.16.22
       interface: Ethernet
+      ip: 172.16.178.2
       mac: d4:04:e6:c5:88:60
       management: false
       model: BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet
@@ -132,18 +157,20 @@ vianden-1:
       sriov: false
       sriov_totalvfs: 0
       vendor: Broadcom Inc. and subsidiaries
-    eth1:
+    eth3:
       driver: bnxt_en
       firmware_version: 231.0.154.0/pkg 23.11.16.22
       interface: Ethernet
+      ip: 172.16.178.3
       mac: d4:04:e6:c5:88:61
       management: false
       model: BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet
       name: eno12409np1
+      rate: 10000000000
       sriov: false
       sriov_totalvfs: 0
       vendor: Broadcom Inc. and subsidiaries
-    eth2:
+    eth4:
       driver: bnxt_en
       firmware_version: 231.0.154.0/pkg 23.11.16.22
       interface: Ethernet
@@ -154,7 +181,7 @@ vianden-1:
       sriov: false
       sriov_totalvfs: 0
       vendor: Broadcom Inc. and subsidiaries
-    eth3:
+    eth5:
       driver: bnxt_en
       firmware_version: 231.0.154.0/pkg 23.11.16.22
       interface: Ethernet
@@ -165,7 +192,7 @@ vianden-1:
       sriov: false
       sriov_totalvfs: 0
       vendor: Broadcom Inc. and subsidiaries
-    eth4:
+    eth6:
       driver: tg3
       firmware_version: FFV23.11.4 bc 5720-v1.39
       interface: Ethernet
@@ -176,7 +203,7 @@ vianden-1:
       sriov: false
       sriov_totalvfs: 0
       vendor: Broadcom Inc. and subsidiaries
-    eth5:
+    eth7:
       driver: tg3
       firmware_version: FFV23.11.4 bc 5720-v1.39
       interface: Ethernet
@@ -187,30 +214,6 @@ vianden-1:
       sriov: false
       sriov_totalvfs: 0
       vendor: Broadcom Inc. and subsidiaries
-    eth6:
-      driver: mlx5_core
-      firmware_version: 22.41.1000 (DEL0000000027)
-      interface: Ethernet
-      ip: 172.16.178.1
-      mac: b8:e9:24:b2:58:9e
-      management: false
-      model: MT2892 Family [ConnectX-6 Dx]
-      name: enp158s0f0np0
-      rate: 100000000000
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Mellanox Technologies
-    eth7:
-      driver: mlx5_core
-      firmware_version: 22.41.1000 (DEL0000000027)
-      interface: Ethernet
-      mac: b8:e9:24:b2:58:9f
-      management: false
-      model: MT2892 Family [ConnectX-6 Dx]
-      name: enp158s0f1np1
-      sriov: false
-      sriov_totalvfs: 0
-      vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
diff --git a/input/grid5000/sites/luxembourg/clusters/vianden/vianden.yaml b/input/grid5000/sites/luxembourg/clusters/vianden/vianden.yaml
index 6e210f3806569a1ae290a9881b8958c138785b13..aa839a219d76d35e6a4f85f645c73044e71fe468 100644
--- a/input/grid5000/sites/luxembourg/clusters/vianden/vianden.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/vianden/vianden.yaml
@@ -23,23 +23,23 @@ nodes:
         mountable: false
         mounted: false
       eth0:
-        enabled: false
-        mountable: false
-        mounted: false
+        enabled: true
+        mountable: true
+        mounted: true
       eth1:
         enabled: false
         mountable: false
         mounted: false
       eth2:
-        enabled: false
-        mountable: false
+        enabled: true
+        mountable: true
         mounted: false
       eth3:
-        enabled: false
-        mountable: false
+        enabled: true
+        mountable: true
         mounted: false
       eth4:
-        enabled: true
+        enabled: false
         mountable: false
         mounted: false
       eth5:
@@ -47,9 +47,9 @@ nodes:
         mountable: false
         mounted: false
       eth6:
-        enabled: true
-        mountable: true
-        mounted: true
+        enabled: false
+        mountable: false
+        mounted: false
       eth7:
         enabled: false
         mountable: false
diff --git a/input/grid5000/sites/luxembourg/networks/sw-b04.yaml b/input/grid5000/sites/luxembourg/networks/sw-b04.yaml
index fc4e4ce2b4e8334976d7e2dd2af4dc9dc98db03a..ade41961a9d7a8c2969381671816e39a26136294 100644
--- a/input/grid5000/sites/luxembourg/networks/sw-b04.yaml
+++ b/input/grid5000/sites/luxembourg/networks/sw-b04.yaml
@@ -65,8 +65,14 @@ sw-b04:
       rate: 25_000_000_000
       kind: node
       ports:
+        8:
+          uid: vianden-1-eth2
+          rate: 10_000_000_000
+        9:
+          uid: vianden-1-eth3
+          rate: 10_000_000_000
         52:
-          uid: vianden-1-eth6
+          uid: vianden-1-eth0
           rate: 100_000_000_000
         53:
           uid: port-channel53
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 545116ec4abce30b204d24954edb8792477597e3..6e9c8c1d9671fad1c4cb45ad2a856f44440761f5 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -261,7 +261,7 @@ nova:
   eno4: eth5
   enp5s0f0: eth0
   enp5s0f1: eth1
-neowise: 
+neowise:
   eno1: eth0
   eno2: eth1
 orion:
@@ -384,14 +384,14 @@ vercors2:
   eno3: eth2
   eno4: eth3
 vianden:
-  enp1s0f0np0: eth0
-  eno12409np1: eth1
-  eno12419np2: eth2
-  eno12429np3: eth3
-  eno8303: eth4
-  eno8403: eth5
-  enp158s0f0np0: eth6
-  enp158s0f1np1: eth7
+  enp158s0f0np0: eth0
+  enp158s0f1np1: eth1
+  enp1s0f0np0: eth2
+  eno12409np1: eth3
+  eno12419np2: eth4
+  eno12429np3: eth5
+  eno8303: eth6
+  eno8403: eth7
 esterel2:
   enp1s0f0np0: eth0
   eno2: eth1