diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json b/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
index 3582f9f0124ee841e7b3105b18de47493da68238..1c09b6bd40ec46fd923e4dece210968ec39daeb3 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
@@ -2,7 +2,7 @@
   "boot_type": "uefi",
   "created_at": "Mon, 10 Feb 2025 00:00:00 GMT",
   "exotic": false,
-  "kavlan": false,
+  "kavlan": true,
   "manufactured_at": "2024-06-26",
   "metrics": [
 
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
index 0dff65178e437b44b2da3e4b0b99bb54a5194746..adcca06a4615fb2703cc3f7978347e3f41c8fe9e 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.1",
+      "kavlan-11": "10.7.246.1",
+      "kavlan-12": "10.11.246.1",
+      "kavlan-13": "10.15.246.1",
+      "kavlan-14": "10.19.246.1",
+      "kavlan-16": "10.27.246.1",
+      "kavlan-17": "10.31.246.1",
+      "kavlan-18": "10.35.246.1",
+      "kavlan-2": "192.168.213.1",
+      "kavlan-20": "10.43.246.1",
+      "kavlan-21": "10.47.246.1",
+      "kavlan-3": "192.168.229.1",
+      "kavlan-4": "10.4.5.1",
+      "kavlan-5": "10.4.69.1",
+      "kavlan-6": "10.4.133.1",
+      "kavlan-7": "10.4.197.1",
+      "kavlan-8": "10.5.5.1",
+      "kavlan-9": "10.5.69.1"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.11",
+      "kavlan-11": "10.7.246.11",
+      "kavlan-12": "10.11.246.11",
+      "kavlan-13": "10.15.246.11",
+      "kavlan-14": "10.19.246.11",
+      "kavlan-16": "10.27.246.11",
+      "kavlan-17": "10.31.246.11",
+      "kavlan-18": "10.35.246.11",
+      "kavlan-2": "192.168.213.11",
+      "kavlan-20": "10.43.246.11",
+      "kavlan-21": "10.47.246.11",
+      "kavlan-3": "192.168.229.11",
+      "kavlan-4": "10.4.5.11",
+      "kavlan-5": "10.4.69.11",
+      "kavlan-6": "10.4.133.11",
+      "kavlan-7": "10.4.197.11",
+      "kavlan-8": "10.5.5.11",
+      "kavlan-9": "10.5.69.11"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.21",
+      "kavlan-11": "10.7.246.21",
+      "kavlan-12": "10.11.246.21",
+      "kavlan-13": "10.15.246.21",
+      "kavlan-14": "10.19.246.21",
+      "kavlan-16": "10.27.246.21",
+      "kavlan-17": "10.31.246.21",
+      "kavlan-18": "10.35.246.21",
+      "kavlan-2": "192.168.213.21",
+      "kavlan-20": "10.43.246.21",
+      "kavlan-21": "10.47.246.21",
+      "kavlan-3": "192.168.229.21",
+      "kavlan-4": "10.4.5.21",
+      "kavlan-5": "10.4.69.21",
+      "kavlan-6": "10.4.133.21",
+      "kavlan-7": "10.4.197.21",
+      "kavlan-8": "10.5.5.21",
+      "kavlan-9": "10.5.69.21"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::1",
+      "kavlan-11": "2001:660:4406:1a0:10d::1",
+      "kavlan-12": "2001:660:4406:2a0:10d::1",
+      "kavlan-13": "2001:660:4406:4a0:10d::1",
+      "kavlan-14": "2001:660:4406:5a0:10d::1",
+      "kavlan-16": "2001:660:4406:7a0:10d::1",
+      "kavlan-17": "2001:660:4406:9a0:10d::1",
+      "kavlan-18": "2001:660:4406:8a0:10d::1",
+      "kavlan-2": "2001:660:4406:181:d::1",
+      "kavlan-20": "2001:660:4406:3a0:10d::1",
+      "kavlan-21": "2001:660:4406:6a0:10d::1",
+      "kavlan-3": "2001:660:4406:182:d::1",
+      "kavlan-4": "2001:660:4406:190:d::1",
+      "kavlan-5": "2001:660:4406:191:d::1",
+      "kavlan-6": "2001:660:4406:192:d::1",
+      "kavlan-7": "2001:660:4406:193:d::1",
+      "kavlan-8": "2001:660:4406:194:d::1",
+      "kavlan-9": "2001:660:4406:195:d::1"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:1",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:1",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:1",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:1",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:1",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:1",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:1",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:1",
+      "kavlan-2": "2001:660:4406:181:d:1:0:1",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:1",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:1",
+      "kavlan-3": "2001:660:4406:182:d:1:0:1",
+      "kavlan-4": "2001:660:4406:190:d:1:0:1",
+      "kavlan-5": "2001:660:4406:191:d:1:0:1",
+      "kavlan-6": "2001:660:4406:192:d:1:0:1",
+      "kavlan-7": "2001:660:4406:193:d:1:0:1",
+      "kavlan-8": "2001:660:4406:194:d:1:0:1",
+      "kavlan-9": "2001:660:4406:195:d:1:0:1"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:1",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:1",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:1",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:1",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:1",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:1",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:1",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:1",
+      "kavlan-2": "2001:660:4406:181:d:2:0:1",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:1",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:1",
+      "kavlan-3": "2001:660:4406:182:d:2:0:1",
+      "kavlan-4": "2001:660:4406:190:d:2:0:1",
+      "kavlan-5": "2001:660:4406:191:d:2:0:1",
+      "kavlan-6": "2001:660:4406:192:d:2:0:1",
+      "kavlan-7": "2001:660:4406:193:d:2:0:1",
+      "kavlan-8": "2001:660:4406:194:d:2:0:1",
+      "kavlan-9": "2001:660:4406:195:d:2:0:1"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.1",
       "ip6": "2001:660:4406:100:d::1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ff:88",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.7",
       "ip6": "2001:660:4406:100:d:1:0:1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ff:89",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.13",
       "ip6": "2001:660:4406:100:d:2:0:1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:1a:dc",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
index be0f7797108fd499c61ee9c5f9407c6080aa3a16..fe87a691e4666fa7e852f7333019f5eed3bd960c 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.2",
+      "kavlan-11": "10.7.246.2",
+      "kavlan-12": "10.11.246.2",
+      "kavlan-13": "10.15.246.2",
+      "kavlan-14": "10.19.246.2",
+      "kavlan-16": "10.27.246.2",
+      "kavlan-17": "10.31.246.2",
+      "kavlan-18": "10.35.246.2",
+      "kavlan-2": "192.168.213.2",
+      "kavlan-20": "10.43.246.2",
+      "kavlan-21": "10.47.246.2",
+      "kavlan-3": "192.168.229.2",
+      "kavlan-4": "10.4.5.2",
+      "kavlan-5": "10.4.69.2",
+      "kavlan-6": "10.4.133.2",
+      "kavlan-7": "10.4.197.2",
+      "kavlan-8": "10.5.5.2",
+      "kavlan-9": "10.5.69.2"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.12",
+      "kavlan-11": "10.7.246.12",
+      "kavlan-12": "10.11.246.12",
+      "kavlan-13": "10.15.246.12",
+      "kavlan-14": "10.19.246.12",
+      "kavlan-16": "10.27.246.12",
+      "kavlan-17": "10.31.246.12",
+      "kavlan-18": "10.35.246.12",
+      "kavlan-2": "192.168.213.12",
+      "kavlan-20": "10.43.246.12",
+      "kavlan-21": "10.47.246.12",
+      "kavlan-3": "192.168.229.12",
+      "kavlan-4": "10.4.5.12",
+      "kavlan-5": "10.4.69.12",
+      "kavlan-6": "10.4.133.12",
+      "kavlan-7": "10.4.197.12",
+      "kavlan-8": "10.5.5.12",
+      "kavlan-9": "10.5.69.12"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.22",
+      "kavlan-11": "10.7.246.22",
+      "kavlan-12": "10.11.246.22",
+      "kavlan-13": "10.15.246.22",
+      "kavlan-14": "10.19.246.22",
+      "kavlan-16": "10.27.246.22",
+      "kavlan-17": "10.31.246.22",
+      "kavlan-18": "10.35.246.22",
+      "kavlan-2": "192.168.213.22",
+      "kavlan-20": "10.43.246.22",
+      "kavlan-21": "10.47.246.22",
+      "kavlan-3": "192.168.229.22",
+      "kavlan-4": "10.4.5.22",
+      "kavlan-5": "10.4.69.22",
+      "kavlan-6": "10.4.133.22",
+      "kavlan-7": "10.4.197.22",
+      "kavlan-8": "10.5.5.22",
+      "kavlan-9": "10.5.69.22"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::2",
+      "kavlan-11": "2001:660:4406:1a0:10d::2",
+      "kavlan-12": "2001:660:4406:2a0:10d::2",
+      "kavlan-13": "2001:660:4406:4a0:10d::2",
+      "kavlan-14": "2001:660:4406:5a0:10d::2",
+      "kavlan-16": "2001:660:4406:7a0:10d::2",
+      "kavlan-17": "2001:660:4406:9a0:10d::2",
+      "kavlan-18": "2001:660:4406:8a0:10d::2",
+      "kavlan-2": "2001:660:4406:181:d::2",
+      "kavlan-20": "2001:660:4406:3a0:10d::2",
+      "kavlan-21": "2001:660:4406:6a0:10d::2",
+      "kavlan-3": "2001:660:4406:182:d::2",
+      "kavlan-4": "2001:660:4406:190:d::2",
+      "kavlan-5": "2001:660:4406:191:d::2",
+      "kavlan-6": "2001:660:4406:192:d::2",
+      "kavlan-7": "2001:660:4406:193:d::2",
+      "kavlan-8": "2001:660:4406:194:d::2",
+      "kavlan-9": "2001:660:4406:195:d::2"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:2",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:2",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:2",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:2",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:2",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:2",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:2",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:2",
+      "kavlan-2": "2001:660:4406:181:d:1:0:2",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:2",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:2",
+      "kavlan-3": "2001:660:4406:182:d:1:0:2",
+      "kavlan-4": "2001:660:4406:190:d:1:0:2",
+      "kavlan-5": "2001:660:4406:191:d:1:0:2",
+      "kavlan-6": "2001:660:4406:192:d:1:0:2",
+      "kavlan-7": "2001:660:4406:193:d:1:0:2",
+      "kavlan-8": "2001:660:4406:194:d:1:0:2",
+      "kavlan-9": "2001:660:4406:195:d:1:0:2"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:2",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:2",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:2",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:2",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:2",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:2",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:2",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:2",
+      "kavlan-2": "2001:660:4406:181:d:2:0:2",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:2",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:2",
+      "kavlan-3": "2001:660:4406:182:d:2:0:2",
+      "kavlan-4": "2001:660:4406:190:d:2:0:2",
+      "kavlan-5": "2001:660:4406:191:d:2:0:2",
+      "kavlan-6": "2001:660:4406:192:d:2:0:2",
+      "kavlan-7": "2001:660:4406:193:d:2:0:2",
+      "kavlan-8": "2001:660:4406:194:d:2:0:2",
+      "kavlan-9": "2001:660:4406:195:d:2:0:2"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.2",
       "ip6": "2001:660:4406:100:d::2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:90:ca",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.8",
       "ip6": "2001:660:4406:100:d:1:0:2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:90:cb",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.14",
       "ip6": "2001:660:4406:100:d:2:0:2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:1a:d8",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
index 16410e124b38142bc5de151a53095ac262479830..333d5418ce22a53519aab07aec081e8fdbf36f9f 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.3",
+      "kavlan-11": "10.7.246.3",
+      "kavlan-12": "10.11.246.3",
+      "kavlan-13": "10.15.246.3",
+      "kavlan-14": "10.19.246.3",
+      "kavlan-16": "10.27.246.3",
+      "kavlan-17": "10.31.246.3",
+      "kavlan-18": "10.35.246.3",
+      "kavlan-2": "192.168.213.3",
+      "kavlan-20": "10.43.246.3",
+      "kavlan-21": "10.47.246.3",
+      "kavlan-3": "192.168.229.3",
+      "kavlan-4": "10.4.5.3",
+      "kavlan-5": "10.4.69.3",
+      "kavlan-6": "10.4.133.3",
+      "kavlan-7": "10.4.197.3",
+      "kavlan-8": "10.5.5.3",
+      "kavlan-9": "10.5.69.3"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.13",
+      "kavlan-11": "10.7.246.13",
+      "kavlan-12": "10.11.246.13",
+      "kavlan-13": "10.15.246.13",
+      "kavlan-14": "10.19.246.13",
+      "kavlan-16": "10.27.246.13",
+      "kavlan-17": "10.31.246.13",
+      "kavlan-18": "10.35.246.13",
+      "kavlan-2": "192.168.213.13",
+      "kavlan-20": "10.43.246.13",
+      "kavlan-21": "10.47.246.13",
+      "kavlan-3": "192.168.229.13",
+      "kavlan-4": "10.4.5.13",
+      "kavlan-5": "10.4.69.13",
+      "kavlan-6": "10.4.133.13",
+      "kavlan-7": "10.4.197.13",
+      "kavlan-8": "10.5.5.13",
+      "kavlan-9": "10.5.69.13"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.23",
+      "kavlan-11": "10.7.246.23",
+      "kavlan-12": "10.11.246.23",
+      "kavlan-13": "10.15.246.23",
+      "kavlan-14": "10.19.246.23",
+      "kavlan-16": "10.27.246.23",
+      "kavlan-17": "10.31.246.23",
+      "kavlan-18": "10.35.246.23",
+      "kavlan-2": "192.168.213.23",
+      "kavlan-20": "10.43.246.23",
+      "kavlan-21": "10.47.246.23",
+      "kavlan-3": "192.168.229.23",
+      "kavlan-4": "10.4.5.23",
+      "kavlan-5": "10.4.69.23",
+      "kavlan-6": "10.4.133.23",
+      "kavlan-7": "10.4.197.23",
+      "kavlan-8": "10.5.5.23",
+      "kavlan-9": "10.5.69.23"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::3",
+      "kavlan-11": "2001:660:4406:1a0:10d::3",
+      "kavlan-12": "2001:660:4406:2a0:10d::3",
+      "kavlan-13": "2001:660:4406:4a0:10d::3",
+      "kavlan-14": "2001:660:4406:5a0:10d::3",
+      "kavlan-16": "2001:660:4406:7a0:10d::3",
+      "kavlan-17": "2001:660:4406:9a0:10d::3",
+      "kavlan-18": "2001:660:4406:8a0:10d::3",
+      "kavlan-2": "2001:660:4406:181:d::3",
+      "kavlan-20": "2001:660:4406:3a0:10d::3",
+      "kavlan-21": "2001:660:4406:6a0:10d::3",
+      "kavlan-3": "2001:660:4406:182:d::3",
+      "kavlan-4": "2001:660:4406:190:d::3",
+      "kavlan-5": "2001:660:4406:191:d::3",
+      "kavlan-6": "2001:660:4406:192:d::3",
+      "kavlan-7": "2001:660:4406:193:d::3",
+      "kavlan-8": "2001:660:4406:194:d::3",
+      "kavlan-9": "2001:660:4406:195:d::3"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:3",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:3",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:3",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:3",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:3",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:3",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:3",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:3",
+      "kavlan-2": "2001:660:4406:181:d:1:0:3",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:3",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:3",
+      "kavlan-3": "2001:660:4406:182:d:1:0:3",
+      "kavlan-4": "2001:660:4406:190:d:1:0:3",
+      "kavlan-5": "2001:660:4406:191:d:1:0:3",
+      "kavlan-6": "2001:660:4406:192:d:1:0:3",
+      "kavlan-7": "2001:660:4406:193:d:1:0:3",
+      "kavlan-8": "2001:660:4406:194:d:1:0:3",
+      "kavlan-9": "2001:660:4406:195:d:1:0:3"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:3",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:3",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:3",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:3",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:3",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:3",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:3",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:3",
+      "kavlan-2": "2001:660:4406:181:d:2:0:3",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:3",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:3",
+      "kavlan-3": "2001:660:4406:182:d:2:0:3",
+      "kavlan-4": "2001:660:4406:190:d:2:0:3",
+      "kavlan-5": "2001:660:4406:191:d:2:0:3",
+      "kavlan-6": "2001:660:4406:192:d:2:0:3",
+      "kavlan-7": "2001:660:4406:193:d:2:0:3",
+      "kavlan-8": "2001:660:4406:194:d:2:0:3",
+      "kavlan-9": "2001:660:4406:195:d:2:0:3"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.3",
       "ip6": "2001:660:4406:100:d::3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ee:84",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.9",
       "ip6": "2001:660:4406:100:d:1:0:3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ee:85",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.15",
       "ip6": "2001:660:4406:100:d:2:0:3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:3a:98",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
index dd9590bd3bdaf40d6667742c5c3503941f93b44f..0d3d3e8dd8909a6760bddc5b1ad1d14b77c1fa7d 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.4",
+      "kavlan-11": "10.7.246.4",
+      "kavlan-12": "10.11.246.4",
+      "kavlan-13": "10.15.246.4",
+      "kavlan-14": "10.19.246.4",
+      "kavlan-16": "10.27.246.4",
+      "kavlan-17": "10.31.246.4",
+      "kavlan-18": "10.35.246.4",
+      "kavlan-2": "192.168.213.4",
+      "kavlan-20": "10.43.246.4",
+      "kavlan-21": "10.47.246.4",
+      "kavlan-3": "192.168.229.4",
+      "kavlan-4": "10.4.5.4",
+      "kavlan-5": "10.4.69.4",
+      "kavlan-6": "10.4.133.4",
+      "kavlan-7": "10.4.197.4",
+      "kavlan-8": "10.5.5.4",
+      "kavlan-9": "10.5.69.4"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.14",
+      "kavlan-11": "10.7.246.14",
+      "kavlan-12": "10.11.246.14",
+      "kavlan-13": "10.15.246.14",
+      "kavlan-14": "10.19.246.14",
+      "kavlan-16": "10.27.246.14",
+      "kavlan-17": "10.31.246.14",
+      "kavlan-18": "10.35.246.14",
+      "kavlan-2": "192.168.213.14",
+      "kavlan-20": "10.43.246.14",
+      "kavlan-21": "10.47.246.14",
+      "kavlan-3": "192.168.229.14",
+      "kavlan-4": "10.4.5.14",
+      "kavlan-5": "10.4.69.14",
+      "kavlan-6": "10.4.133.14",
+      "kavlan-7": "10.4.197.14",
+      "kavlan-8": "10.5.5.14",
+      "kavlan-9": "10.5.69.14"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.24",
+      "kavlan-11": "10.7.246.24",
+      "kavlan-12": "10.11.246.24",
+      "kavlan-13": "10.15.246.24",
+      "kavlan-14": "10.19.246.24",
+      "kavlan-16": "10.27.246.24",
+      "kavlan-17": "10.31.246.24",
+      "kavlan-18": "10.35.246.24",
+      "kavlan-2": "192.168.213.24",
+      "kavlan-20": "10.43.246.24",
+      "kavlan-21": "10.47.246.24",
+      "kavlan-3": "192.168.229.24",
+      "kavlan-4": "10.4.5.24",
+      "kavlan-5": "10.4.69.24",
+      "kavlan-6": "10.4.133.24",
+      "kavlan-7": "10.4.197.24",
+      "kavlan-8": "10.5.5.24",
+      "kavlan-9": "10.5.69.24"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::4",
+      "kavlan-11": "2001:660:4406:1a0:10d::4",
+      "kavlan-12": "2001:660:4406:2a0:10d::4",
+      "kavlan-13": "2001:660:4406:4a0:10d::4",
+      "kavlan-14": "2001:660:4406:5a0:10d::4",
+      "kavlan-16": "2001:660:4406:7a0:10d::4",
+      "kavlan-17": "2001:660:4406:9a0:10d::4",
+      "kavlan-18": "2001:660:4406:8a0:10d::4",
+      "kavlan-2": "2001:660:4406:181:d::4",
+      "kavlan-20": "2001:660:4406:3a0:10d::4",
+      "kavlan-21": "2001:660:4406:6a0:10d::4",
+      "kavlan-3": "2001:660:4406:182:d::4",
+      "kavlan-4": "2001:660:4406:190:d::4",
+      "kavlan-5": "2001:660:4406:191:d::4",
+      "kavlan-6": "2001:660:4406:192:d::4",
+      "kavlan-7": "2001:660:4406:193:d::4",
+      "kavlan-8": "2001:660:4406:194:d::4",
+      "kavlan-9": "2001:660:4406:195:d::4"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:4",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:4",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:4",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:4",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:4",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:4",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:4",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:4",
+      "kavlan-2": "2001:660:4406:181:d:1:0:4",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:4",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:4",
+      "kavlan-3": "2001:660:4406:182:d:1:0:4",
+      "kavlan-4": "2001:660:4406:190:d:1:0:4",
+      "kavlan-5": "2001:660:4406:191:d:1:0:4",
+      "kavlan-6": "2001:660:4406:192:d:1:0:4",
+      "kavlan-7": "2001:660:4406:193:d:1:0:4",
+      "kavlan-8": "2001:660:4406:194:d:1:0:4",
+      "kavlan-9": "2001:660:4406:195:d:1:0:4"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:4",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:4",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:4",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:4",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:4",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:4",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:4",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:4",
+      "kavlan-2": "2001:660:4406:181:d:2:0:4",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:4",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:4",
+      "kavlan-3": "2001:660:4406:182:d:2:0:4",
+      "kavlan-4": "2001:660:4406:190:d:2:0:4",
+      "kavlan-5": "2001:660:4406:191:d:2:0:4",
+      "kavlan-6": "2001:660:4406:192:d:2:0:4",
+      "kavlan-7": "2001:660:4406:193:d:2:0:4",
+      "kavlan-8": "2001:660:4406:194:d:2:0:4",
+      "kavlan-9": "2001:660:4406:195:d:2:0:4"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.4",
       "ip6": "2001:660:4406:100:d::4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:2d:80",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.10",
       "ip6": "2001:660:4406:100:d:1:0:4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:2d:81",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.16",
       "ip6": "2001:660:4406:100:d:2:0:4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:1a:28",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
index 268e5e965b362b451c6fbf7377c90ba979481f9a..b9171bb5f4c972648f44fcbccc5f73585cc2e14c 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.5",
+      "kavlan-11": "10.7.246.5",
+      "kavlan-12": "10.11.246.5",
+      "kavlan-13": "10.15.246.5",
+      "kavlan-14": "10.19.246.5",
+      "kavlan-16": "10.27.246.5",
+      "kavlan-17": "10.31.246.5",
+      "kavlan-18": "10.35.246.5",
+      "kavlan-2": "192.168.213.5",
+      "kavlan-20": "10.43.246.5",
+      "kavlan-21": "10.47.246.5",
+      "kavlan-3": "192.168.229.5",
+      "kavlan-4": "10.4.5.5",
+      "kavlan-5": "10.4.69.5",
+      "kavlan-6": "10.4.133.5",
+      "kavlan-7": "10.4.197.5",
+      "kavlan-8": "10.5.5.5",
+      "kavlan-9": "10.5.69.5"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.15",
+      "kavlan-11": "10.7.246.15",
+      "kavlan-12": "10.11.246.15",
+      "kavlan-13": "10.15.246.15",
+      "kavlan-14": "10.19.246.15",
+      "kavlan-16": "10.27.246.15",
+      "kavlan-17": "10.31.246.15",
+      "kavlan-18": "10.35.246.15",
+      "kavlan-2": "192.168.213.15",
+      "kavlan-20": "10.43.246.15",
+      "kavlan-21": "10.47.246.15",
+      "kavlan-3": "192.168.229.15",
+      "kavlan-4": "10.4.5.15",
+      "kavlan-5": "10.4.69.15",
+      "kavlan-6": "10.4.133.15",
+      "kavlan-7": "10.4.197.15",
+      "kavlan-8": "10.5.5.15",
+      "kavlan-9": "10.5.69.15"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.25",
+      "kavlan-11": "10.7.246.25",
+      "kavlan-12": "10.11.246.25",
+      "kavlan-13": "10.15.246.25",
+      "kavlan-14": "10.19.246.25",
+      "kavlan-16": "10.27.246.25",
+      "kavlan-17": "10.31.246.25",
+      "kavlan-18": "10.35.246.25",
+      "kavlan-2": "192.168.213.25",
+      "kavlan-20": "10.43.246.25",
+      "kavlan-21": "10.47.246.25",
+      "kavlan-3": "192.168.229.25",
+      "kavlan-4": "10.4.5.25",
+      "kavlan-5": "10.4.69.25",
+      "kavlan-6": "10.4.133.25",
+      "kavlan-7": "10.4.197.25",
+      "kavlan-8": "10.5.5.25",
+      "kavlan-9": "10.5.69.25"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::5",
+      "kavlan-11": "2001:660:4406:1a0:10d::5",
+      "kavlan-12": "2001:660:4406:2a0:10d::5",
+      "kavlan-13": "2001:660:4406:4a0:10d::5",
+      "kavlan-14": "2001:660:4406:5a0:10d::5",
+      "kavlan-16": "2001:660:4406:7a0:10d::5",
+      "kavlan-17": "2001:660:4406:9a0:10d::5",
+      "kavlan-18": "2001:660:4406:8a0:10d::5",
+      "kavlan-2": "2001:660:4406:181:d::5",
+      "kavlan-20": "2001:660:4406:3a0:10d::5",
+      "kavlan-21": "2001:660:4406:6a0:10d::5",
+      "kavlan-3": "2001:660:4406:182:d::5",
+      "kavlan-4": "2001:660:4406:190:d::5",
+      "kavlan-5": "2001:660:4406:191:d::5",
+      "kavlan-6": "2001:660:4406:192:d::5",
+      "kavlan-7": "2001:660:4406:193:d::5",
+      "kavlan-8": "2001:660:4406:194:d::5",
+      "kavlan-9": "2001:660:4406:195:d::5"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:5",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:5",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:5",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:5",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:5",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:5",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:5",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:5",
+      "kavlan-2": "2001:660:4406:181:d:1:0:5",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:5",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:5",
+      "kavlan-3": "2001:660:4406:182:d:1:0:5",
+      "kavlan-4": "2001:660:4406:190:d:1:0:5",
+      "kavlan-5": "2001:660:4406:191:d:1:0:5",
+      "kavlan-6": "2001:660:4406:192:d:1:0:5",
+      "kavlan-7": "2001:660:4406:193:d:1:0:5",
+      "kavlan-8": "2001:660:4406:194:d:1:0:5",
+      "kavlan-9": "2001:660:4406:195:d:1:0:5"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:5",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:5",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:5",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:5",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:5",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:5",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:5",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:5",
+      "kavlan-2": "2001:660:4406:181:d:2:0:5",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:5",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:5",
+      "kavlan-3": "2001:660:4406:182:d:2:0:5",
+      "kavlan-4": "2001:660:4406:190:d:2:0:5",
+      "kavlan-5": "2001:660:4406:191:d:2:0:5",
+      "kavlan-6": "2001:660:4406:192:d:2:0:5",
+      "kavlan-7": "2001:660:4406:193:d:2:0:5",
+      "kavlan-8": "2001:660:4406:194:d:2:0:5",
+      "kavlan-9": "2001:660:4406:195:d:2:0:5"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.5",
       "ip6": "2001:660:4406:100:d::5",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:91:d8",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.11",
       "ip6": "2001:660:4406:100:d:1:0:5",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:91:d9",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.17",
       "ip6": "2001:660:4406:100:d:2:0:5",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:3a:f0",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
index a27bb6c14ad4e9ab9c5f8564b18a67b8584b699d..0d359283de60dce1d16e1fb640a154a056d35c81 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.6",
+      "kavlan-11": "10.7.246.6",
+      "kavlan-12": "10.11.246.6",
+      "kavlan-13": "10.15.246.6",
+      "kavlan-14": "10.19.246.6",
+      "kavlan-16": "10.27.246.6",
+      "kavlan-17": "10.31.246.6",
+      "kavlan-18": "10.35.246.6",
+      "kavlan-2": "192.168.213.6",
+      "kavlan-20": "10.43.246.6",
+      "kavlan-21": "10.47.246.6",
+      "kavlan-3": "192.168.229.6",
+      "kavlan-4": "10.4.5.6",
+      "kavlan-5": "10.4.69.6",
+      "kavlan-6": "10.4.133.6",
+      "kavlan-7": "10.4.197.6",
+      "kavlan-8": "10.5.5.6",
+      "kavlan-9": "10.5.69.6"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.16",
+      "kavlan-11": "10.7.246.16",
+      "kavlan-12": "10.11.246.16",
+      "kavlan-13": "10.15.246.16",
+      "kavlan-14": "10.19.246.16",
+      "kavlan-16": "10.27.246.16",
+      "kavlan-17": "10.31.246.16",
+      "kavlan-18": "10.35.246.16",
+      "kavlan-2": "192.168.213.16",
+      "kavlan-20": "10.43.246.16",
+      "kavlan-21": "10.47.246.16",
+      "kavlan-3": "192.168.229.16",
+      "kavlan-4": "10.4.5.16",
+      "kavlan-5": "10.4.69.16",
+      "kavlan-6": "10.4.133.16",
+      "kavlan-7": "10.4.197.16",
+      "kavlan-8": "10.5.5.16",
+      "kavlan-9": "10.5.69.16"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.26",
+      "kavlan-11": "10.7.246.26",
+      "kavlan-12": "10.11.246.26",
+      "kavlan-13": "10.15.246.26",
+      "kavlan-14": "10.19.246.26",
+      "kavlan-16": "10.27.246.26",
+      "kavlan-17": "10.31.246.26",
+      "kavlan-18": "10.35.246.26",
+      "kavlan-2": "192.168.213.26",
+      "kavlan-20": "10.43.246.26",
+      "kavlan-21": "10.47.246.26",
+      "kavlan-3": "192.168.229.26",
+      "kavlan-4": "10.4.5.26",
+      "kavlan-5": "10.4.69.26",
+      "kavlan-6": "10.4.133.26",
+      "kavlan-7": "10.4.197.26",
+      "kavlan-8": "10.5.5.26",
+      "kavlan-9": "10.5.69.26"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::6",
+      "kavlan-11": "2001:660:4406:1a0:10d::6",
+      "kavlan-12": "2001:660:4406:2a0:10d::6",
+      "kavlan-13": "2001:660:4406:4a0:10d::6",
+      "kavlan-14": "2001:660:4406:5a0:10d::6",
+      "kavlan-16": "2001:660:4406:7a0:10d::6",
+      "kavlan-17": "2001:660:4406:9a0:10d::6",
+      "kavlan-18": "2001:660:4406:8a0:10d::6",
+      "kavlan-2": "2001:660:4406:181:d::6",
+      "kavlan-20": "2001:660:4406:3a0:10d::6",
+      "kavlan-21": "2001:660:4406:6a0:10d::6",
+      "kavlan-3": "2001:660:4406:182:d::6",
+      "kavlan-4": "2001:660:4406:190:d::6",
+      "kavlan-5": "2001:660:4406:191:d::6",
+      "kavlan-6": "2001:660:4406:192:d::6",
+      "kavlan-7": "2001:660:4406:193:d::6",
+      "kavlan-8": "2001:660:4406:194:d::6",
+      "kavlan-9": "2001:660:4406:195:d::6"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:6",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:6",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:6",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:6",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:6",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:6",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:6",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:6",
+      "kavlan-2": "2001:660:4406:181:d:1:0:6",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:6",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:6",
+      "kavlan-3": "2001:660:4406:182:d:1:0:6",
+      "kavlan-4": "2001:660:4406:190:d:1:0:6",
+      "kavlan-5": "2001:660:4406:191:d:1:0:6",
+      "kavlan-6": "2001:660:4406:192:d:1:0:6",
+      "kavlan-7": "2001:660:4406:193:d:1:0:6",
+      "kavlan-8": "2001:660:4406:194:d:1:0:6",
+      "kavlan-9": "2001:660:4406:195:d:1:0:6"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:6",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:6",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:6",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:6",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:6",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:6",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:6",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:6",
+      "kavlan-2": "2001:660:4406:181:d:2:0:6",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:6",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:6",
+      "kavlan-3": "2001:660:4406:182:d:2:0:6",
+      "kavlan-4": "2001:660:4406:190:d:2:0:6",
+      "kavlan-5": "2001:660:4406:191:d:2:0:6",
+      "kavlan-6": "2001:660:4406:192:d:2:0:6",
+      "kavlan-7": "2001:660:4406:193:d:2:0:6",
+      "kavlan-8": "2001:660:4406:194:d:2:0:6",
+      "kavlan-9": "2001:660:4406:195:d:2:0:6"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.6",
       "ip6": "2001:660:4406:100:d::6",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:25:10",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.12",
       "ip6": "2001:660:4406:100:d:1:0:6",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:25:11",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.18",
       "ip6": "2001:660:4406:100:d:2:0:6",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:3a:8c",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
index 94d16164e4cb10109610693ab1b1cf6fae26e073..70ef62c313503035d20cfbb8b657e86c756b2f75 100644
--- a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
@@ -15,7 +15,7 @@
     },
     {
       "backplane_bps": 400000000000,
-      "kavlan_pattern": "%LINECARD%/%PORT%",
+      "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
       "kind": "node",
       "ports": [
         {
diff --git a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
index 654be4f5c53d590d9a9f8123f880ee768fdaf90f..d9530e4ef149ea06ad0ea0b0990ee18aa2e2c900 100644
--- a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
+++ b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
@@ -1,7 +1,7 @@
 ---
 model: HPE Proliant DL380 Gen11
 created_at: 2025-02-10
-kavlan: false
+kavlan: true
 boot_type: uefi
 exotic: false
 queues:
diff --git a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
index f89536ec48297a261caeac8348fdeef55520dd1b..c1f60e607e87a5e80190b74a0940d5065dfd38da 100644
--- a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
@@ -12,7 +12,7 @@ skinovis2-prod-01:
   linecards:
     1:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      kavlan_pattern: "%LINECARD%/%PORT%"
+      kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
       rate: 25_000_000_000
       backplane_bps: 400_000_000_000
       kind: node
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 42d54af414e9f5df21678c87e6b5b1500d2401f0..08aa8f2283fd508b07946ba98e1a6997b9ebab92 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -71,6 +71,9 @@ vlans:
       local grenoble servan eth0 0 0 4 0
       local grenoble servan fpga0 0 0 4 10
       local grenoble servan fpga1 0 0 4 20
+      local grenoble kinovis eth0 0 0 5 0
+      local grenoble kinovis eth1 0 0 5 10
+      local grenoble kinovis eth2 0 0 5 20
       local lille chifflot eth0 0 0 4 0
       local lille chifflot eth1 0 0 5 0
       local lille chiclet eth0 0 0 6 0
@@ -216,8 +219,13 @@ vlans:
       global grenoble servan fpga0 0 0 35 10
       global grenoble servan fpga1 0 0 35 20
       global rennes paradoxe eth0 0 0 36 0
-      global sophia uvb eth0 0 0 40 0
-      global sophia musa eth0 0 0 39 0
+      global sophia mercantour1 eth0 0 0 37 0
+      global sophia mercantour2 eth0 0 0 37 16
+      global sophia mercantour3 eth0 0 0 37 24
+      global sophia mercantour4 eth0 0 0 37 40
+      global sophia mercantour5 eth0 0 0 37 41
+      global sophia mercantour6 eth0 0 0 37 45
+      global sophia mercantour7 eth0 0 0 37 46
       global sophia esterel1 eth0 0 0 38 0
       global sophia esterel2 eth0 0 0 38 1
       global sophia esterel3 eth0 0 0 38 2
@@ -259,13 +267,8 @@ vlans:
       global sophia esterel39 eth0 0 0 38 52
       global sophia esterel40 eth0 0 0 38 53
       global sophia esterel41 eth0 0 0 38 55
-      global sophia mercantour1 eth0 0 0 37 0
-      global sophia mercantour2 eth0 0 0 37 16
-      global sophia mercantour3 eth0 0 0 37 24
-      global sophia mercantour4 eth0 0 0 37 40
-      global sophia mercantour5 eth0 0 0 37 41
-      global sophia mercantour6 eth0 0 0 37 45
-      global sophia mercantour7 eth0 0 0 37 46
+      global sophia musa eth0 0 0 39 0
+      global sophia uvb eth0 0 0 40 0
       global nancy gruss eth2 0 0 41 0
       global luxembourg petitprince eth0 0 0 46 0
       global luxembourg petitprince eth1 0 0 46 100
@@ -284,6 +287,9 @@ vlans:
       global rennes roazhon7 eth0 0 0 53 10
       global rennes roazhon8 eth0 0 0 53 20
       global rennes roazhon9 eth0 0 0 53 30
+      global grenoble kinovis eth0 0 0 54 0
+      global grenoble kinovis eth1 0 0 54 10
+      global grenoble kinovis eth2 0 0 54 20
       routed grenoble yeti eth0 0 4 0 0
       routed grenoble dahu eth0 0 4 1 0
       routed grenoble troll eth0 0 4 2 0
@@ -291,6 +297,9 @@ vlans:
       routed grenoble servan eth0 0 4 4 0
       routed grenoble servan fpga0 0 4 4 10
       routed grenoble servan fpga1 0 4 4 20
+      routed grenoble kinovis eth0 0 4 5 0
+      routed grenoble kinovis eth1 0 4 5 10
+      routed grenoble kinovis eth2 0 4 5 20
       routed lille chifflot eth0 0 8 4 0
       routed lille chifflot eth1 0 8 5 0
       routed lille chiclet eth0 0 8 6 0