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 a194cb063a9fc6b41892b8a8c9e286b8cb9ece36..49242246f2103a1bf09fea80ddfd87c8b846e7a5 100644
--- a/data/grid5000/sites/luxembourg/clusters/vianden/nodes/vianden-1.json
+++ b/data/grid5000/sites/luxembourg/clusters/vianden/nodes/vianden-1.json
@@ -20,6 +20,136 @@
     "warranty_end": "2028-07-15"
   },
   "exotic": false,
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.196.1",
+      "kavlan-11": "10.7.239.1",
+      "kavlan-12": "10.11.239.1",
+      "kavlan-13": "10.15.239.1",
+      "kavlan-14": "10.19.239.1",
+      "kavlan-16": "10.27.239.1",
+      "kavlan-17": "10.31.239.1",
+      "kavlan-18": "10.35.239.1",
+      "kavlan-2": "192.168.212.1",
+      "kavlan-20": "10.43.239.1",
+      "kavlan-21": "10.47.239.1",
+      "kavlan-22": "10.51.239.1",
+      "kavlan-3": "192.168.228.1",
+      "kavlan-4": "10.40.4.1",
+      "kavlan-5": "10.40.68.1",
+      "kavlan-6": "10.40.132.1",
+      "kavlan-7": "10.40.196.1",
+      "kavlan-8": "10.41.4.1",
+      "kavlan-9": "10.41.68.1"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.196.2",
+      "kavlan-11": "10.7.239.2",
+      "kavlan-12": "10.11.239.2",
+      "kavlan-13": "10.15.239.2",
+      "kavlan-14": "10.19.239.2",
+      "kavlan-16": "10.27.239.2",
+      "kavlan-17": "10.31.239.2",
+      "kavlan-18": "10.35.239.2",
+      "kavlan-2": "192.168.212.2",
+      "kavlan-20": "10.43.239.2",
+      "kavlan-21": "10.47.239.2",
+      "kavlan-22": "10.51.239.2",
+      "kavlan-3": "192.168.228.2",
+      "kavlan-4": "10.40.4.2",
+      "kavlan-5": "10.40.68.2",
+      "kavlan-6": "10.40.132.2",
+      "kavlan-7": "10.40.196.2",
+      "kavlan-8": "10.41.4.2",
+      "kavlan-9": "10.41.68.2"
+    },
+    "eth3": {
+      "kavlan-1": "192.168.196.3",
+      "kavlan-11": "10.7.239.3",
+      "kavlan-12": "10.11.239.3",
+      "kavlan-13": "10.15.239.3",
+      "kavlan-14": "10.19.239.3",
+      "kavlan-16": "10.27.239.3",
+      "kavlan-17": "10.31.239.3",
+      "kavlan-18": "10.35.239.3",
+      "kavlan-2": "192.168.212.3",
+      "kavlan-20": "10.43.239.3",
+      "kavlan-21": "10.47.239.3",
+      "kavlan-22": "10.51.239.3",
+      "kavlan-3": "192.168.228.3",
+      "kavlan-4": "10.40.4.3",
+      "kavlan-5": "10.40.68.3",
+      "kavlan-6": "10.40.132.3",
+      "kavlan-7": "10.40.196.3",
+      "kavlan-8": "10.41.4.3",
+      "kavlan-9": "10.41.68.3"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:380:3::1",
+      "kavlan-11": "2001:660:4406:1a0:303::1",
+      "kavlan-12": "2001:660:4406:2a0:303::1",
+      "kavlan-13": "2001:660:4406:4a0:303::1",
+      "kavlan-14": "2001:660:4406:5a0:303::1",
+      "kavlan-16": "2001:660:4406:7a0:303::1",
+      "kavlan-17": "2001:660:4406:9a0:303::1",
+      "kavlan-18": "2001:660:4406:8a0:303::1",
+      "kavlan-2": "2001:660:4406:381:3::1",
+      "kavlan-20": "2001:660:4406:3a0:303::1",
+      "kavlan-21": "2001:660:4406:6a0:303::1",
+      "kavlan-22": "2001:660:4406:ba0:303::1",
+      "kavlan-3": "2001:660:4406:382:3::1",
+      "kavlan-4": "2001:660:4406:390:3::1",
+      "kavlan-5": "2001:660:4406:391:3::1",
+      "kavlan-6": "2001:660:4406:392:3::1",
+      "kavlan-7": "2001:660:4406:393:3::1",
+      "kavlan-8": "2001:660:4406:394:3::1",
+      "kavlan-9": "2001:660:4406:395:3::1"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:380:3:1:0:1",
+      "kavlan-11": "2001:660:4406:1a0:303:1:0:1",
+      "kavlan-12": "2001:660:4406:2a0:303:1:0:1",
+      "kavlan-13": "2001:660:4406:4a0:303:1:0:1",
+      "kavlan-14": "2001:660:4406:5a0:303:1:0:1",
+      "kavlan-16": "2001:660:4406:7a0:303:1:0:1",
+      "kavlan-17": "2001:660:4406:9a0:303:1:0:1",
+      "kavlan-18": "2001:660:4406:8a0:303:1:0:1",
+      "kavlan-2": "2001:660:4406:381:3:1:0:1",
+      "kavlan-20": "2001:660:4406:3a0:303:1:0:1",
+      "kavlan-21": "2001:660:4406:6a0:303:1:0:1",
+      "kavlan-22": "2001:660:4406:ba0:303:1:0:1",
+      "kavlan-3": "2001:660:4406:382:3:1:0:1",
+      "kavlan-4": "2001:660:4406:390:3:1:0:1",
+      "kavlan-5": "2001:660:4406:391:3:1:0:1",
+      "kavlan-6": "2001:660:4406:392:3:1:0:1",
+      "kavlan-7": "2001:660:4406:393:3:1:0:1",
+      "kavlan-8": "2001:660:4406:394:3:1:0:1",
+      "kavlan-9": "2001:660:4406:395:3:1:0:1"
+    },
+    "eth3": {
+      "kavlan-1": "2001:660:4406:380:3:2:0:1",
+      "kavlan-11": "2001:660:4406:1a0:303:2:0:1",
+      "kavlan-12": "2001:660:4406:2a0:303:2:0:1",
+      "kavlan-13": "2001:660:4406:4a0:303:2:0:1",
+      "kavlan-14": "2001:660:4406:5a0:303:2:0:1",
+      "kavlan-16": "2001:660:4406:7a0:303:2:0:1",
+      "kavlan-17": "2001:660:4406:9a0:303:2:0:1",
+      "kavlan-18": "2001:660:4406:8a0:303:2:0:1",
+      "kavlan-2": "2001:660:4406:381:3:2:0:1",
+      "kavlan-20": "2001:660:4406:3a0:303:2:0:1",
+      "kavlan-21": "2001:660:4406:6a0:303:2:0:1",
+      "kavlan-22": "2001:660:4406:ba0:303:2:0:1",
+      "kavlan-3": "2001:660:4406:382:3:2:0:1",
+      "kavlan-4": "2001:660:4406:390:3:2:0:1",
+      "kavlan-5": "2001:660:4406:391:3:2:0:1",
+      "kavlan-6": "2001:660:4406:392:3:2:0:1",
+      "kavlan-7": "2001:660:4406:393:3:2:0:1",
+      "kavlan-8": "2001:660:4406:394:3:2:0:1",
+      "kavlan-9": "2001:660:4406:395:3:2:0:1"
+    }
+  },
   "main_memory": {
     "ram_size": 2199023255552
   },
@@ -200,7 +330,7 @@
       "interface": "Ethernet",
       "ip": "172.16.178.1",
       "ip6": "2001:660:4406:300:3::1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "b8:e9:24:b2:58:9e",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
@@ -240,7 +370,7 @@
       "interface": "Ethernet",
       "ip": "172.16.178.2",
       "ip6": "2001:660:4406:300:3:1:0:1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:c5:88:60",
       "management": false,
       "model": "BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet",
@@ -263,7 +393,7 @@
       "interface": "Ethernet",
       "ip": "172.16.178.3",
       "ip6": "2001:660:4406:300:3:2:0:1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:c5:88:61",
       "management": false,
       "model": "BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet",
diff --git a/data/grid5000/sites/luxembourg/clusters/vianden/vianden.json b/data/grid5000/sites/luxembourg/clusters/vianden/vianden.json
index 76c55c2ec9f0ea6d4c7755474ce3512fcd87a076..09d23aa737e6033572d7ed38ac51a1f61b223915 100644
--- a/data/grid5000/sites/luxembourg/clusters/vianden/vianden.json
+++ b/data/grid5000/sites/luxembourg/clusters/vianden/vianden.json
@@ -2,7 +2,7 @@
   "boot_type": "uefi",
   "created_at": "Mon, 06 Jan 2025 00:00:00 GMT",
   "exotic": false,
-  "kavlan": false,
+  "kavlan": true,
   "manufactured_at": "2024-07-14",
   "metrics": [
     {
diff --git a/input/grid5000/sites/luxembourg/clusters/vianden/vianden.yaml b/input/grid5000/sites/luxembourg/clusters/vianden/vianden.yaml
index aa839a219d76d35e6a4f85f645c73044e71fe468..f2293852ca364af1cdf0e9e746482af9378d8a3c 100644
--- a/input/grid5000/sites/luxembourg/clusters/vianden/vianden.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/vianden/vianden.yaml
@@ -1,7 +1,7 @@
 ---
 model: Dell PowerEdge XE9680
 created_at: 2025-01-06
-kavlan: false
+kavlan: true
 boot_type: uefi
 exotic: false # TODO: specify if 'true' or 'false'
 queues:
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 115f7b42bfffd0b1f593f72d574dbd3a6634dbdf..4ecb0fed459c188e5387870f3415651b3e22a019 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -122,6 +122,9 @@ vlans:
       local louvain spirou eth0 0 0 0 0
       local luxembourg petitprince eth0 0 0 2 0
       local luxembourg petitprince eth1 0 0 3 0
+      local luxembourg vianden eth0 0 0 4 0
+      local luxembourg vianden eth2 0 0 4 1
+      local luxembourg vianden eth3 0 0 4 2
       local lyon sagittaire eth1 0 0 0 0
       local lyon taurus eth0 0 0 1 0
       local lyon orion eth0 0 0 2 0
@@ -315,6 +318,9 @@ vlans:
       global nancy gruss eth2 0 0 41 0
       global luxembourg petitprince eth0 0 0 46 0
       global luxembourg petitprince eth1 0 0 46 100
+      global luxembourg vianden eth0 0 0 47 0
+      global luxembourg vianden eth2 0 0 47 1
+      global luxembourg vianden eth3 0 0 47 2
       global nantes econome eth0 0 0 48 0
       global nantes ecotype eth0 0 0 49 0
       global nantes ecotype eth1 0 0 49 100
@@ -510,6 +516,9 @@ vlans:
       routed sophia mercantour7 eth0 0 32 4 46
       routed luxembourg petitprince eth0 0 40 2 0
       routed luxembourg petitprince eth1 0 40 3 0
+      routed luxembourg vianden eth0 0 40 4 0
+      routed luxembourg vianden eth2 0 40 4 1
+      routed luxembourg vianden eth3 0 40 4 2
       routed nantes econome eth0 0 44 0 0
       routed nantes ecotype eth0 0 44 1 0
       routed nantes ecotype eth1 0 44 2 0