diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
index bdb929dfcd327a9b41b940b2d89f0d3f869c4062..bd12a86d8fd11f8e71bd2ddd701db78cbf3e078d 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
@@ -2,7 +2,7 @@
   "boot_type": "uefi",
   "created_at": "Thu, 01 Dec 2022 00:00:00 GMT",
   "exotic": false,
-  "kavlan": false,
+  "kavlan": true,
   "metrics": [
     {
       "description": "Default subset of metrics from Prometheus Node Exporter",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
index 5b6ddb5ffd72a5995dad9b19e53b0f9fec46f5a2..e9a8f72c62e97695e39d131eac3346debfcc8f29 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
@@ -18,6 +18,48 @@
     "serial": "CZJ244064Z"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.192.1",
+      "kavlan-11": "10.7.242.1",
+      "kavlan-12": "10.11.242.1",
+      "kavlan-13": "10.15.242.1",
+      "kavlan-14": "10.19.242.1",
+      "kavlan-16": "10.27.242.1",
+      "kavlan-18": "10.35.242.1",
+      "kavlan-2": "192.168.208.1",
+      "kavlan-20": "10.43.242.1",
+      "kavlan-21": "10.47.242.1",
+      "kavlan-3": "192.168.224.1",
+      "kavlan-4": "10.28.0.1",
+      "kavlan-5": "10.28.64.1",
+      "kavlan-6": "10.28.128.1",
+      "kavlan-7": "10.28.192.1",
+      "kavlan-8": "10.29.0.1",
+      "kavlan-9": "10.29.64.1"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:980:9::1",
+      "kavlan-11": "2001:660:4406:1a0:909::1",
+      "kavlan-12": "2001:660:4406:2a0:909::1",
+      "kavlan-13": "2001:660:4406:4a0:909::1",
+      "kavlan-14": "2001:660:4406:5a0:909::1",
+      "kavlan-16": "2001:660:4406:7a0:909::1",
+      "kavlan-18": "2001:660:4406:8a0:909::1",
+      "kavlan-2": "2001:660:4406:981:9::1",
+      "kavlan-20": "2001:660:4406:3a0:909::1",
+      "kavlan-21": "2001:660:4406:6a0:909::1",
+      "kavlan-3": "2001:660:4406:982:9::1",
+      "kavlan-4": "2001:660:4406:990:9::1",
+      "kavlan-5": "2001:660:4406:991:9::1",
+      "kavlan-6": "2001:660:4406:992:9::1",
+      "kavlan-7": "2001:660:4406:993:9::1",
+      "kavlan-8": "2001:660:4406:994:9::1",
+      "kavlan-9": "2001:660:4406:995:9::1"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -78,7 +120,7 @@
       "interface": "Ethernet",
       "ip": "172.16.120.1",
       "ip6": "2001:660:4406:900:9::1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "84:16:0c:4b:9b:36",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
index 8c14472502144495c4fecf7ea7ab122208576649..4ceb67a439a54d605f1bcb568c0429489bc76abc 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
@@ -18,6 +18,48 @@
     "serial": "CZJ2440651"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.192.2",
+      "kavlan-11": "10.7.242.2",
+      "kavlan-12": "10.11.242.2",
+      "kavlan-13": "10.15.242.2",
+      "kavlan-14": "10.19.242.2",
+      "kavlan-16": "10.27.242.2",
+      "kavlan-18": "10.35.242.2",
+      "kavlan-2": "192.168.208.2",
+      "kavlan-20": "10.43.242.2",
+      "kavlan-21": "10.47.242.2",
+      "kavlan-3": "192.168.224.2",
+      "kavlan-4": "10.28.0.2",
+      "kavlan-5": "10.28.64.2",
+      "kavlan-6": "10.28.128.2",
+      "kavlan-7": "10.28.192.2",
+      "kavlan-8": "10.29.0.2",
+      "kavlan-9": "10.29.64.2"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:980:9::2",
+      "kavlan-11": "2001:660:4406:1a0:909::2",
+      "kavlan-12": "2001:660:4406:2a0:909::2",
+      "kavlan-13": "2001:660:4406:4a0:909::2",
+      "kavlan-14": "2001:660:4406:5a0:909::2",
+      "kavlan-16": "2001:660:4406:7a0:909::2",
+      "kavlan-18": "2001:660:4406:8a0:909::2",
+      "kavlan-2": "2001:660:4406:981:9::2",
+      "kavlan-20": "2001:660:4406:3a0:909::2",
+      "kavlan-21": "2001:660:4406:6a0:909::2",
+      "kavlan-3": "2001:660:4406:982:9::2",
+      "kavlan-4": "2001:660:4406:990:9::2",
+      "kavlan-5": "2001:660:4406:991:9::2",
+      "kavlan-6": "2001:660:4406:992:9::2",
+      "kavlan-7": "2001:660:4406:993:9::2",
+      "kavlan-8": "2001:660:4406:994:9::2",
+      "kavlan-9": "2001:660:4406:995:9::2"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -78,7 +120,7 @@
       "interface": "Ethernet",
       "ip": "172.16.120.2",
       "ip6": "2001:660:4406:900:9::2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "84:16:0c:4a:29:04",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
index ad6c63716e43691b222d30065a52178056997923..a49e429092c78c24a4428456d5081804ad1339e7 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
@@ -18,6 +18,48 @@
     "serial": "CZJ2440652"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.192.3",
+      "kavlan-11": "10.7.242.3",
+      "kavlan-12": "10.11.242.3",
+      "kavlan-13": "10.15.242.3",
+      "kavlan-14": "10.19.242.3",
+      "kavlan-16": "10.27.242.3",
+      "kavlan-18": "10.35.242.3",
+      "kavlan-2": "192.168.208.3",
+      "kavlan-20": "10.43.242.3",
+      "kavlan-21": "10.47.242.3",
+      "kavlan-3": "192.168.224.3",
+      "kavlan-4": "10.28.0.3",
+      "kavlan-5": "10.28.64.3",
+      "kavlan-6": "10.28.128.3",
+      "kavlan-7": "10.28.192.3",
+      "kavlan-8": "10.29.0.3",
+      "kavlan-9": "10.29.64.3"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:980:9::3",
+      "kavlan-11": "2001:660:4406:1a0:909::3",
+      "kavlan-12": "2001:660:4406:2a0:909::3",
+      "kavlan-13": "2001:660:4406:4a0:909::3",
+      "kavlan-14": "2001:660:4406:5a0:909::3",
+      "kavlan-16": "2001:660:4406:7a0:909::3",
+      "kavlan-18": "2001:660:4406:8a0:909::3",
+      "kavlan-2": "2001:660:4406:981:9::3",
+      "kavlan-20": "2001:660:4406:3a0:909::3",
+      "kavlan-21": "2001:660:4406:6a0:909::3",
+      "kavlan-3": "2001:660:4406:982:9::3",
+      "kavlan-4": "2001:660:4406:990:9::3",
+      "kavlan-5": "2001:660:4406:991:9::3",
+      "kavlan-6": "2001:660:4406:992:9::3",
+      "kavlan-7": "2001:660:4406:993:9::3",
+      "kavlan-8": "2001:660:4406:994:9::3",
+      "kavlan-9": "2001:660:4406:995:9::3"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -78,7 +120,7 @@
       "interface": "Ethernet",
       "ip": "172.16.120.3",
       "ip6": "2001:660:4406:900:9::3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "84:16:0c:4b:fe:6c",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
index e8b538286b978099c96c1f6e37976c8929006732..624d61ba40036f0dfb0ff471fd69a5236c27179c 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
@@ -18,6 +18,48 @@
     "serial": "CZJ244064Y"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.192.4",
+      "kavlan-11": "10.7.242.4",
+      "kavlan-12": "10.11.242.4",
+      "kavlan-13": "10.15.242.4",
+      "kavlan-14": "10.19.242.4",
+      "kavlan-16": "10.27.242.4",
+      "kavlan-18": "10.35.242.4",
+      "kavlan-2": "192.168.208.4",
+      "kavlan-20": "10.43.242.4",
+      "kavlan-21": "10.47.242.4",
+      "kavlan-3": "192.168.224.4",
+      "kavlan-4": "10.28.0.4",
+      "kavlan-5": "10.28.64.4",
+      "kavlan-6": "10.28.128.4",
+      "kavlan-7": "10.28.192.4",
+      "kavlan-8": "10.29.0.4",
+      "kavlan-9": "10.29.64.4"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:980:9::4",
+      "kavlan-11": "2001:660:4406:1a0:909::4",
+      "kavlan-12": "2001:660:4406:2a0:909::4",
+      "kavlan-13": "2001:660:4406:4a0:909::4",
+      "kavlan-14": "2001:660:4406:5a0:909::4",
+      "kavlan-16": "2001:660:4406:7a0:909::4",
+      "kavlan-18": "2001:660:4406:8a0:909::4",
+      "kavlan-2": "2001:660:4406:981:9::4",
+      "kavlan-20": "2001:660:4406:3a0:909::4",
+      "kavlan-21": "2001:660:4406:6a0:909::4",
+      "kavlan-3": "2001:660:4406:982:9::4",
+      "kavlan-4": "2001:660:4406:990:9::4",
+      "kavlan-5": "2001:660:4406:991:9::4",
+      "kavlan-6": "2001:660:4406:992:9::4",
+      "kavlan-7": "2001:660:4406:993:9::4",
+      "kavlan-8": "2001:660:4406:994:9::4",
+      "kavlan-9": "2001:660:4406:995:9::4"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -78,7 +120,7 @@
       "interface": "Ethernet",
       "ip": "172.16.120.4",
       "ip6": "2001:660:4406:900:9::4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "84:16:0c:4b:de:14",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
index d27df59fd3db5db9387070304eac9f75aefb188b..2673f6b82f426f9dc199f061f269291d6d1ba2de 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
@@ -18,6 +18,48 @@
     "serial": "CZJ2440654"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.192.5",
+      "kavlan-11": "10.7.242.5",
+      "kavlan-12": "10.11.242.5",
+      "kavlan-13": "10.15.242.5",
+      "kavlan-14": "10.19.242.5",
+      "kavlan-16": "10.27.242.5",
+      "kavlan-18": "10.35.242.5",
+      "kavlan-2": "192.168.208.5",
+      "kavlan-20": "10.43.242.5",
+      "kavlan-21": "10.47.242.5",
+      "kavlan-3": "192.168.224.5",
+      "kavlan-4": "10.28.0.5",
+      "kavlan-5": "10.28.64.5",
+      "kavlan-6": "10.28.128.5",
+      "kavlan-7": "10.28.192.5",
+      "kavlan-8": "10.29.0.5",
+      "kavlan-9": "10.29.64.5"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:980:9::5",
+      "kavlan-11": "2001:660:4406:1a0:909::5",
+      "kavlan-12": "2001:660:4406:2a0:909::5",
+      "kavlan-13": "2001:660:4406:4a0:909::5",
+      "kavlan-14": "2001:660:4406:5a0:909::5",
+      "kavlan-16": "2001:660:4406:7a0:909::5",
+      "kavlan-18": "2001:660:4406:8a0:909::5",
+      "kavlan-2": "2001:660:4406:981:9::5",
+      "kavlan-20": "2001:660:4406:3a0:909::5",
+      "kavlan-21": "2001:660:4406:6a0:909::5",
+      "kavlan-3": "2001:660:4406:982:9::5",
+      "kavlan-4": "2001:660:4406:990:9::5",
+      "kavlan-5": "2001:660:4406:991:9::5",
+      "kavlan-6": "2001:660:4406:992:9::5",
+      "kavlan-7": "2001:660:4406:993:9::5",
+      "kavlan-8": "2001:660:4406:994:9::5",
+      "kavlan-9": "2001:660:4406:995:9::5"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -78,7 +120,7 @@
       "interface": "Ethernet",
       "ip": "172.16.120.5",
       "ip6": "2001:660:4406:900:9::5",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "84:16:0c:4b:1a:ae",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
index e5cdbfef7273a869e88461cfaecd2873ced73ae5..e24fcf63d8267cf4a34b8ee2904cd02ec63807c5 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
@@ -18,6 +18,48 @@
     "serial": "CZJ2440655"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.192.6",
+      "kavlan-11": "10.7.242.6",
+      "kavlan-12": "10.11.242.6",
+      "kavlan-13": "10.15.242.6",
+      "kavlan-14": "10.19.242.6",
+      "kavlan-16": "10.27.242.6",
+      "kavlan-18": "10.35.242.6",
+      "kavlan-2": "192.168.208.6",
+      "kavlan-20": "10.43.242.6",
+      "kavlan-21": "10.47.242.6",
+      "kavlan-3": "192.168.224.6",
+      "kavlan-4": "10.28.0.6",
+      "kavlan-5": "10.28.64.6",
+      "kavlan-6": "10.28.128.6",
+      "kavlan-7": "10.28.192.6",
+      "kavlan-8": "10.29.0.6",
+      "kavlan-9": "10.29.64.6"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:980:9::6",
+      "kavlan-11": "2001:660:4406:1a0:909::6",
+      "kavlan-12": "2001:660:4406:2a0:909::6",
+      "kavlan-13": "2001:660:4406:4a0:909::6",
+      "kavlan-14": "2001:660:4406:5a0:909::6",
+      "kavlan-16": "2001:660:4406:7a0:909::6",
+      "kavlan-18": "2001:660:4406:8a0:909::6",
+      "kavlan-2": "2001:660:4406:981:9::6",
+      "kavlan-20": "2001:660:4406:3a0:909::6",
+      "kavlan-21": "2001:660:4406:6a0:909::6",
+      "kavlan-3": "2001:660:4406:982:9::6",
+      "kavlan-4": "2001:660:4406:990:9::6",
+      "kavlan-5": "2001:660:4406:991:9::6",
+      "kavlan-6": "2001:660:4406:992:9::6",
+      "kavlan-7": "2001:660:4406:993:9::6",
+      "kavlan-8": "2001:660:4406:994:9::6",
+      "kavlan-9": "2001:660:4406:995:9::6"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -78,7 +120,7 @@
       "interface": "Ethernet",
       "ip": "172.16.120.6",
       "ip6": "2001:660:4406:900:9::6",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "84:16:0c:4b:cd:8e",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
index f4f57534ae5c7fa344a2d3f427ed89b36be9411c..cbe03b78b7d90e5656575d1eb33b1593f23308c7 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
@@ -18,6 +18,48 @@
     "serial": "CZJ244064X"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.192.7",
+      "kavlan-11": "10.7.242.7",
+      "kavlan-12": "10.11.242.7",
+      "kavlan-13": "10.15.242.7",
+      "kavlan-14": "10.19.242.7",
+      "kavlan-16": "10.27.242.7",
+      "kavlan-18": "10.35.242.7",
+      "kavlan-2": "192.168.208.7",
+      "kavlan-20": "10.43.242.7",
+      "kavlan-21": "10.47.242.7",
+      "kavlan-3": "192.168.224.7",
+      "kavlan-4": "10.28.0.7",
+      "kavlan-5": "10.28.64.7",
+      "kavlan-6": "10.28.128.7",
+      "kavlan-7": "10.28.192.7",
+      "kavlan-8": "10.29.0.7",
+      "kavlan-9": "10.29.64.7"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:980:9::7",
+      "kavlan-11": "2001:660:4406:1a0:909::7",
+      "kavlan-12": "2001:660:4406:2a0:909::7",
+      "kavlan-13": "2001:660:4406:4a0:909::7",
+      "kavlan-14": "2001:660:4406:5a0:909::7",
+      "kavlan-16": "2001:660:4406:7a0:909::7",
+      "kavlan-18": "2001:660:4406:8a0:909::7",
+      "kavlan-2": "2001:660:4406:981:9::7",
+      "kavlan-20": "2001:660:4406:3a0:909::7",
+      "kavlan-21": "2001:660:4406:6a0:909::7",
+      "kavlan-3": "2001:660:4406:982:9::7",
+      "kavlan-4": "2001:660:4406:990:9::7",
+      "kavlan-5": "2001:660:4406:991:9::7",
+      "kavlan-6": "2001:660:4406:992:9::7",
+      "kavlan-7": "2001:660:4406:993:9::7",
+      "kavlan-8": "2001:660:4406:994:9::7",
+      "kavlan-9": "2001:660:4406:995:9::7"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -78,7 +120,7 @@
       "interface": "Ethernet",
       "ip": "172.16.120.7",
       "ip6": "2001:660:4406:900:9::7",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "84:16:0c:4b:c1:88",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
index d7ae0989b5f79bdc4e3b50e199c08a7e3f86d45a..43010af5ddfb35f534aaabf04359c3fd20758647 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
@@ -18,6 +18,48 @@
     "serial": "CZJ2440656"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.192.8",
+      "kavlan-11": "10.7.242.8",
+      "kavlan-12": "10.11.242.8",
+      "kavlan-13": "10.15.242.8",
+      "kavlan-14": "10.19.242.8",
+      "kavlan-16": "10.27.242.8",
+      "kavlan-18": "10.35.242.8",
+      "kavlan-2": "192.168.208.8",
+      "kavlan-20": "10.43.242.8",
+      "kavlan-21": "10.47.242.8",
+      "kavlan-3": "192.168.224.8",
+      "kavlan-4": "10.28.0.8",
+      "kavlan-5": "10.28.64.8",
+      "kavlan-6": "10.28.128.8",
+      "kavlan-7": "10.28.192.8",
+      "kavlan-8": "10.29.0.8",
+      "kavlan-9": "10.29.64.8"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:980:9::8",
+      "kavlan-11": "2001:660:4406:1a0:909::8",
+      "kavlan-12": "2001:660:4406:2a0:909::8",
+      "kavlan-13": "2001:660:4406:4a0:909::8",
+      "kavlan-14": "2001:660:4406:5a0:909::8",
+      "kavlan-16": "2001:660:4406:7a0:909::8",
+      "kavlan-18": "2001:660:4406:8a0:909::8",
+      "kavlan-2": "2001:660:4406:981:9::8",
+      "kavlan-20": "2001:660:4406:3a0:909::8",
+      "kavlan-21": "2001:660:4406:6a0:909::8",
+      "kavlan-3": "2001:660:4406:982:9::8",
+      "kavlan-4": "2001:660:4406:990:9::8",
+      "kavlan-5": "2001:660:4406:991:9::8",
+      "kavlan-6": "2001:660:4406:992:9::8",
+      "kavlan-7": "2001:660:4406:993:9::8",
+      "kavlan-8": "2001:660:4406:994:9::8",
+      "kavlan-9": "2001:660:4406:995:9::8"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -78,7 +120,7 @@
       "interface": "Ethernet",
       "ip": "172.16.120.8",
       "ip6": "2001:660:4406:900:9::8",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "84:16:0c:4b:cd:46",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
index d8d2c056321b2fcec2460f63ee95fecb2a641072..3de1a459a2cdf1d7d1573c4177b2efa046319bec 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
@@ -18,6 +18,48 @@
     "serial": "CZJ2440650"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.192.9",
+      "kavlan-11": "10.7.242.9",
+      "kavlan-12": "10.11.242.9",
+      "kavlan-13": "10.15.242.9",
+      "kavlan-14": "10.19.242.9",
+      "kavlan-16": "10.27.242.9",
+      "kavlan-18": "10.35.242.9",
+      "kavlan-2": "192.168.208.9",
+      "kavlan-20": "10.43.242.9",
+      "kavlan-21": "10.47.242.9",
+      "kavlan-3": "192.168.224.9",
+      "kavlan-4": "10.28.0.9",
+      "kavlan-5": "10.28.64.9",
+      "kavlan-6": "10.28.128.9",
+      "kavlan-7": "10.28.192.9",
+      "kavlan-8": "10.29.0.9",
+      "kavlan-9": "10.29.64.9"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:980:9::9",
+      "kavlan-11": "2001:660:4406:1a0:909::9",
+      "kavlan-12": "2001:660:4406:2a0:909::9",
+      "kavlan-13": "2001:660:4406:4a0:909::9",
+      "kavlan-14": "2001:660:4406:5a0:909::9",
+      "kavlan-16": "2001:660:4406:7a0:909::9",
+      "kavlan-18": "2001:660:4406:8a0:909::9",
+      "kavlan-2": "2001:660:4406:981:9::9",
+      "kavlan-20": "2001:660:4406:3a0:909::9",
+      "kavlan-21": "2001:660:4406:6a0:909::9",
+      "kavlan-3": "2001:660:4406:982:9::9",
+      "kavlan-4": "2001:660:4406:990:9::9",
+      "kavlan-5": "2001:660:4406:991:9::9",
+      "kavlan-6": "2001:660:4406:992:9::9",
+      "kavlan-7": "2001:660:4406:993:9::9",
+      "kavlan-8": "2001:660:4406:994:9::9",
+      "kavlan-9": "2001:660:4406:995:9::9"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -78,7 +120,7 @@
       "interface": "Ethernet",
       "ip": "172.16.120.9",
       "ip6": "2001:660:4406:900:9::9",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "84:16:0c:4b:2e:28",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
index d715dc3deeeac75c4163c59cc38da9b3a19f4559..8a518fd46a23ee237006c561851a032ed35240ee 100644
--- a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
@@ -1,6 +1,6 @@
 model: HPE Proliant DL360 Gen10+
 created_at: 2022-12-01
-kavlan: false
+kavlan: true
 boot_type: uefi
 exotic: false
 queues:
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index e6cbe55345ac8eff415780df39d20268304e0511..002485e262604475be0a630ed74700bcd1efba98 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -118,6 +118,7 @@ vlans:
       local rennes parasilo eth0 0 0 7 0
       local rennes parasilo eth1 0 0 8 0
       local sophia uvb eth0 0 0 1 0
+      local toulouse montcalm eth0 0 0 0 0
       global grenoble yeti eth0 0 0 0 0
       global grenoble dahu eth0 0 0 1 0
       global lille chifflot eth0 0 0 4 0
@@ -175,6 +176,7 @@ vlans:
       global nantes econome eth0 0 0 48 0
       global nantes ecotype eth0 0 0 49 0
       global nantes ecotype eth1 0 0 49 100
+      global toulouse montcalm eth0 0 0 50 0
       routed grenoble yeti eth0 0 4 0 0
       routed grenoble dahu eth0 0 4 1 0
       routed grenoble troll eth0 0 4 2 0
@@ -226,6 +228,7 @@ vlans:
       routed rennes paravance eth1 0 24 6 0
       routed rennes parasilo eth0 0 24 7 0
       routed rennes parasilo eth1 0 24 8 0
+      routed toulouse montcalm eth0 0 28 0 0
       routed sophia uvb eth0 0 32 1 0
       routed luxembourg petitprince eth0 0 40 2 0
       routed luxembourg petitprince eth1 0 40 3 0