diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
index 3e591d6d2e6d221072fcb0960679f1f714ed7f38..943d7f92d9a4269862f49ddc1e069c95dd549422 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
@@ -130,9 +130,9 @@
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "name": "eno2",
-      "network_address": "neowise-1.lyon.grid5000.fr",
+      "network_address": "neowise-1-eth1.lyon.grid5000.fr",
       "rate": 10000000000,
       "switch": "sneowise",
       "switch_port": "1/1",
@@ -152,6 +152,7 @@
       "mountable": true,
       "mounted": true,
       "name": "ib0",
+      "netmask": "255.255.240.0",
       "network_address": "neowise-1-ib0.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
       "mac": "00:00:10:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:f1:e8",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "name": "ib1",
-      "network_address": "neowise-1-ib1.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
     },
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
index be80c4d37fb429531084cba0407784f6e72d00d5..94530f19e40536d2fd8437583a3406acbc4c8c16 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
@@ -130,9 +130,9 @@
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "name": "eno2",
-      "network_address": "neowise-10.lyon.grid5000.fr",
+      "network_address": "neowise-10-eth1.lyon.grid5000.fr",
       "rate": 10000000000,
       "switch": "sneowise",
       "switch_port": "1/10",
@@ -141,7 +141,6 @@
     {
       "device": "ib0",
       "driver": "mlx5_core",
-      "enabled": true,
       "firmware_version": "20.29.2002",
       "guid": "0x0c42a103009106a2",
       "interface": "InfiniBand",
@@ -149,17 +148,13 @@
       "mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:91:06:a2",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
       "name": "ib0",
-      "network_address": "neowise-10-ib0.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib1",
       "driver": "mlx5_core",
-      "enabled": true,
       "firmware_version": "20.29.2002",
       "guid": "0x0c42a103008d2118",
       "interface": "InfiniBand",
@@ -167,10 +162,7 @@
       "mac": "00:00:10:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:8d:21:18",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
       "name": "ib1",
-      "network_address": "neowise-10-ib1.lyon.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox Technologies"
     },
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
index cc2032eda9fae7fbe84da5533fdfe4116dea694f..248b2b17d1e5cc487d2bb1dabc72bc855b67dbc8 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
@@ -130,9 +130,9 @@
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "name": "eno2",
-      "network_address": "neowise-2.lyon.grid5000.fr",
+      "network_address": "neowise-2-eth1.lyon.grid5000.fr",
       "rate": 10000000000,
       "switch": "sneowise",
       "switch_port": "1/2",
@@ -152,6 +152,7 @@
       "mountable": true,
       "mounted": true,
       "name": "ib0",
+      "netmask": "255.255.240.0",
       "network_address": "neowise-2-ib0.lyon.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
       "mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:d2:13:2a",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "name": "ib1",
-      "network_address": "neowise-2-ib1.lyon.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox Technologies"
     },
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
index d718304e755f882333e153f57db44e2f07b4ec63..4dd1e5224429ee1ae143be1b6439958d82eac2e7 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
@@ -130,9 +130,9 @@
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "name": "eno2",
-      "network_address": "neowise-3.lyon.grid5000.fr",
+      "network_address": "neowise-3-eth1.lyon.grid5000.fr",
       "rate": 10000000000,
       "switch": "sneowise",
       "switch_port": "1/3",
@@ -152,6 +152,7 @@
       "mountable": true,
       "mounted": true,
       "name": "ib0",
+      "netmask": "255.255.240.0",
       "network_address": "neowise-3-ib0.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
       "mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:f9:0c",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "name": "ib1",
-      "network_address": "neowise-3-ib1.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
     },
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
index 6cdddc471750c7c0b69ca8d15f0f5a4d04d4dc27..51a18c8b3ff74aecf18992975a3a7fb2aceb09bd 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
@@ -130,9 +130,9 @@
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "name": "eno2",
-      "network_address": "neowise-4.lyon.grid5000.fr",
+      "network_address": "neowise-4-eth1.lyon.grid5000.fr",
       "rate": 10000000000,
       "switch": "sneowise",
       "switch_port": "1/4",
@@ -152,6 +152,7 @@
       "mountable": true,
       "mounted": true,
       "name": "ib0",
+      "netmask": "255.255.240.0",
       "network_address": "neowise-4-ib0.lyon.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
       "mac": "00:00:10:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fb:60",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "name": "ib1",
-      "network_address": "neowise-4-ib1.lyon.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox Technologies"
     },
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
index f633fbaf0fb437a29b38cdc9d037699c121ae0f5..8d9509f7e7e85bbd5cd41bc50e6f8d862630db9a 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
@@ -130,9 +130,9 @@
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "name": "eno2",
-      "network_address": "neowise-5.lyon.grid5000.fr",
+      "network_address": "neowise-5-eth1.lyon.grid5000.fr",
       "rate": 10000000000,
       "switch": "sneowise",
       "switch_port": "1/5",
@@ -152,6 +152,7 @@
       "mountable": true,
       "mounted": true,
       "name": "ib0",
+      "netmask": "255.255.240.0",
       "network_address": "neowise-5-ib0.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
       "mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:d2:0b:6a",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "name": "ib1",
-      "network_address": "neowise-5-ib1.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
     },
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
index 18a33ec415a3d5c82fdc4d4c6843c799eb10aa5e..b398e0d9e542d9fba9615a97e6023e7d9899c082 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
@@ -130,9 +130,9 @@
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "name": "eno2",
-      "network_address": "neowise-6.lyon.grid5000.fr",
+      "network_address": "neowise-6-eth1.lyon.grid5000.fr",
       "rate": 10000000000,
       "switch": "sneowise",
       "switch_port": "1/6",
@@ -152,6 +152,7 @@
       "mountable": true,
       "mounted": true,
       "name": "ib0",
+      "netmask": "255.255.240.0",
       "network_address": "neowise-6-ib0.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
       "mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fa:f4",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "name": "ib1",
-      "network_address": "neowise-6-ib1.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
     },
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
index 67724823de1ae3a4e9b131f48c05f74fa05dd429..6a56310d64aecda2f682d3b97a87966b42d3714d 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
@@ -130,9 +130,9 @@
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "name": "eno2",
-      "network_address": "neowise-7.lyon.grid5000.fr",
+      "network_address": "neowise-7-eth1.lyon.grid5000.fr",
       "rate": 10000000000,
       "switch": "sneowise",
       "switch_port": "1/7",
@@ -152,6 +152,7 @@
       "mountable": true,
       "mounted": true,
       "name": "ib0",
+      "netmask": "255.255.240.0",
       "network_address": "neowise-7-ib0.lyon.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
       "mac": "00:00:10:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fc:54",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "name": "ib1",
-      "network_address": "neowise-7-ib1.lyon.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox Technologies"
     },
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
index 312f140805568ac9fbea401e6e3b9cd37ff5329a..916b9d1cfc135ff4b824ecbc111e156a5891f26e 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.json
@@ -130,9 +130,9 @@
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "name": "eno2",
-      "network_address": "neowise-8.lyon.grid5000.fr",
+      "network_address": "neowise-8-eth1.lyon.grid5000.fr",
       "rate": 10000000000,
       "switch": "sneowise",
       "switch_port": "1/8",
@@ -152,6 +152,7 @@
       "mountable": true,
       "mounted": true,
       "name": "ib0",
+      "netmask": "255.255.240.0",
       "network_address": "neowise-8-ib0.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
@@ -167,10 +168,9 @@
       "mac": "00:00:04:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fc:20",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
+      "mountable": false,
+      "mounted": false,
       "name": "ib1",
-      "network_address": "neowise-8-ib1.lyon.grid5000.fr",
       "rate": 200000000000,
       "vendor": "Mellanox Technologies"
     },
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
index a5bc6deb67db3370bc20cea221a5374e3cce2f5d..54f4c7bea5848c56186945be744da868330d6636 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
@@ -130,9 +130,9 @@
       "management": false,
       "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "name": "eno2",
-      "network_address": "neowise-9.lyon.grid5000.fr",
+      "network_address": "neowise-9-eth1.lyon.grid5000.fr",
       "rate": 10000000000,
       "switch": "sneowise",
       "switch_port": "1/9",
@@ -141,7 +141,6 @@
     {
       "device": "ib0",
       "driver": "mlx5_core",
-      "enabled": true,
       "firmware_version": "20.29.2002",
       "guid": "0x0c42a10300a0fc48",
       "interface": "InfiniBand",
@@ -149,17 +148,13 @@
       "mac": "00:00:08:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fc:48",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
       "name": "ib0",
-      "network_address": "neowise-9-ib0.lyon.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib1",
       "driver": "mlx5_core",
-      "enabled": true,
       "firmware_version": "20.29.2002",
       "guid": "0x0c42a10300a0fc20",
       "interface": "InfiniBand",
@@ -167,10 +162,7 @@
       "mac": "00:00:04:28:fe:80:00:00:00:00:00:00:0c:42:a1:03:00:a0:fc:20",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
-      "mountable": true,
-      "mounted": true,
       "name": "ib1",
-      "network_address": "neowise-9-ib1.lyon.grid5000.fr",
       "rate": 10000000000,
       "vendor": "Mellanox Technologies"
     },
diff --git a/input/grid5000/sites/lyon/clusters/neowise/neowise.yaml b/input/grid5000/sites/lyon/clusters/neowise/neowise.yaml
index 3e3bbcf9337263bc17ba90f0cc4bb351262a0e6b..24ca2c87fa89ae9ef6dc5313f9b0d2175ab2c11b 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/neowise.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/neowise.yaml
@@ -29,15 +29,7 @@ nodes:
       eth1: 
         enabled: true
         mountable: true
-        mounted: true
-      ib0: 
-        enabled: true
-        mountable: true
-        mounted: true
-      ib1: 
-        enabled: true
-        mountable: true
-        mounted: true
+        mounted: false
     storage_devices:
       nvme0n1:
         interface: NVME
diff --git a/input/grid5000/sites/lyon/clusters/neowise/neowise_ib.yaml b/input/grid5000/sites/lyon/clusters/neowise/neowise_ib.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b9f669daf9bef6ced39bb8dfa0c136263b7cd5b1
--- /dev/null
+++ b/input/grid5000/sites/lyon/clusters/neowise/neowise_ib.yaml
@@ -0,0 +1,13 @@
+---
+nodes:
+  neowise-[1-8]:
+    network_adapters:
+      ib0:
+        enabled: true
+        mountable: true
+        mounted: true
+        netmask: 255.255.240.0
+      ib1:
+        enabled: true
+        mountable: false
+        mounted: false