diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw.json b/data/grid5000/sites/luxembourg/network_equipments/gw.json
index 1a6a9a2b674b6dfbe686d0ec7c397b22b8e9ece0..5420984f6d9589c0713207c1b49ce834941ddc60 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/gw.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/gw.json
@@ -1,14 +1,69 @@
 {
   "alias": [
-    "gw-luxembourg"
+    "gw-luxembourg",
+    "gw-belval"
   ],
-  "backplane_bps": 720000000000,
+  "backplane_bps": 4800000000000,
   "channels": {
-    "Port-channel4": {
+    "port-channel1": {
+      "kind": "server",
+      "port": "port-channel1",
+      "rate": 20000000000,
+      "uid": "pve-1"
+    },
+    "port-channel3": {
+      "kind": "server",
+      "port": "port-channel3",
+      "rate": 20000000000,
+      "uid": "pve-2"
+    },
+    "port-channel41": {
+      "kind": "server",
+      "port": "port-channel7",
+      "rate": 20000000000,
+      "uid": "backup-link-to-hpc-gw"
+    },
+    "port-channel43": {
+      "kind": "switch",
+      "port": "port-channel43",
+      "rate": 20000000000,
+      "uid": "sw-admin-b09"
+    },
+    "port-channel45": {
+      "kind": "switch",
+      "port": "port-channel45",
+      "rate": 20000000000,
+      "uid": "sw-admin-b04"
+    },
+    "port-channel5": {
+      "kind": "server",
+      "port": "port-channel5",
+      "rate": 20000000000,
+      "uid": "pve-1-backup-link"
+    },
+    "port-channel55": {
+      "kind": "server",
+      "port": "port-channel55",
+      "rate": 20000000000,
+      "uid": "srv-data"
+    },
+    "port-channel57": {
       "kind": "switch",
-      "port": "port-channel4",
+      "port": "port-channel57",
       "rate": 20000000000,
-      "uid": "ul-grid5000-sw02"
+      "uid": "sw-b09"
+    },
+    "port-channel59": {
+      "kind": "switch",
+      "port": "port-channel59",
+      "rate": 20000000000,
+      "uid": "sw-b04"
+    },
+    "port-channel7": {
+      "kind": "server",
+      "port": "port-channel7",
+      "rate": 20000000000,
+      "uid": "pve-2-backup-link"
     }
   },
   "ip": "172.16.191.254",
@@ -19,127 +74,50 @@
     },
     {
       "backplane_bps": 40000000000,
-      "kavlan_pattern": "Gi%LINECARD%/%PORT%",
+      "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
       "kind": "node",
       "ports": [
         {
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/1",
+          "uid": "port-channel1"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/2",
+          "uid": "port-channel1"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/3",
+          "uid": "port-channel3"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/4",
+          "uid": "port-channel3"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/5",
+          "uid": "port-channel5"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/6",
+          "uid": "port-channel5"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/7",
+          "uid": "port-channel7"
         },
         {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "server",
-          "snmp_name": "GigabitEthernet1/35",
-          "uid": "cronos-eth1"
-        },
-        {
-        },
-        {
-          "kind": "server",
-          "snmp_name": "GigabitEthernet1/37",
-          "uid": "cronos-eth2"
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
-    },
-    {
-      "backplane_bps": 40000000000,
-      "kavlan_pattern": "Gi%LINECARD%/%PORT%",
-      "kind": "node",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/8",
+          "uid": "port-channel7"
         },
         {
         },
@@ -206,27 +184,45 @@
         {
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/41",
+          "uid": "port-channel41"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/42",
+          "uid": "port-channel41"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/43",
+          "uid": "port-channel43"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/44",
+          "uid": "port-channel43"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/45",
+          "uid": "port-channel45"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/46",
+          "uid": "port-channel45"
         },
         {
         },
         {
+          "kind": "backbone",
+          "snmp_name": "Ethernet1/48",
+          "uid": "renater-luxembourg"
         },
         {
         },
         {
-          "kind": "server",
-          "snmp_name": "GigabitEthernet2/44",
-          "uid": "cronos"
         },
         {
         },
@@ -234,57 +230,41 @@
         },
         {
         },
-        {
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
-    },
-    {
-      "backplane_bps": 40000000000,
-      "kavlan_pattern": "Ti%LINECARD%/%PORT%",
-      "kind": "channel",
-      "ports": [
         {
         },
         {
           "kind": "channel",
-          "snmp_name": "TenGigabitEthernet3/1",
-          "uid": "Port-channel4"
+          "snmp_name": "Ethernet1/55",
+          "uid": "port-channel55"
         },
         {
           "kind": "channel",
-          "snmp_name": "TenGigabitEthernet3/2",
-          "uid": "Port-channel4"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "TenGigabitEthernet%LINECARD%/%PORT%"
-    },
-    {
-    },
-    {
-      "backplane_bps": 40000000000,
-      "kavlan_pattern": "Ti%LINECARD%/%PORT%",
-      "kind": "backbone",
-      "ports": [
-        {
+          "snmp_name": "Ethernet1/56",
+          "uid": "port-channel55"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/57",
+          "uid": "port-channel57"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/58",
+          "uid": "port-channel57"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/59",
+          "uid": "port-channel59"
         },
         {
-          "kind": "backbone",
-          "rate": 10000000000,
-          "snmp_name": "TenGigabitEthernet5/4",
-          "uid": "renater-luxembourg"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/60",
+          "uid": "port-channel59"
         }
       ],
       "rate": 1000000000,
-      "snmp_pattern": "TenGigabitEthernet%LINECARD%/%PORT%"
+      "snmp_pattern": "Ethernet%LINECARD%/%PORT%"
     }
   ],
   "managed_by_us": true,
@@ -362,7 +342,7 @@
       }
     }
   ],
-  "model": "cisco WS-C6506-E",
+  "model": "cisco Nexus9000 C93240YC-FX2",
   "site": "luxembourg",
   "snmp_community": "public",
   "type": "network_equipment",
@@ -455,5 +435,5 @@
       "name": "kavlan-20"
     }
   },
-  "warranty": "2018-12-01"
+  "warranty": "2029-01-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/servers/cronos.json b/data/grid5000/sites/luxembourg/servers/cronos.json
deleted file mode 100644
index 48f2961efd1134c90b608a7ee61fc343994592c5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/servers/cronos.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "kind": "physical",
-  "network_adapters": {
-    "adm": {
-      "ip": "172.17.191.2"
-    },
-    "bmc": {
-      "ip": "172.17.190.2"
-    },
-    "default": {
-      "ip": "172.16.191.2"
-    }
-  },
-  "redfish": false,
-  "serial": "JSG625J",
-  "type": "server",
-  "uid": "cronos",
-  "warranty": "2017-05"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/servers/zeus.json b/data/grid5000/sites/luxembourg/servers/zeus.json
deleted file mode 100644
index 6e620af585b96155b07b96f632c8344edad6d7e7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/servers/zeus.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "alias": [
-
-  ],
-  "kind": "physical",
-  "network_adapters": {
-    "bmc": {
-      "ip": "172.17.190.60",
-      "mac": "00:1C:23:BD:F5:B2"
-    },
-    "default": {
-      "ip": "172.16.191.60"
-    }
-  },
-  "redfish": true,
-  "serial": "8L6033J",
-  "type": "server",
-  "uid": "zeus",
-  "warranty": "2016-08"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
index 8d92003d827c030bbd6a4f1f47db4099fe867633..9b684a4e532226ca65148cb60324fea4ece15655 100644
--- a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
@@ -1,14 +1,15 @@
 ---
 gw:
-  model: cisco WS-C6506-E
+  model: cisco Nexus9000 C93240YC-FX2
   alias:
     - gw-luxembourg
+    - gw-belval
   kind: router
   managed_by_us: true
   site: luxembourg
   snmp_community: public
-  warranty: 2018-12-01
-  backplane_bps: 720000000000
+  warranty: 2029-01-01 # Contrat site université renouvelé en continu
+  backplane_bps: 4800000000000
   ip: 172.16.191.254
   ip6: 2001:660:4406:300::ffff:ffff
   metrics:
@@ -119,60 +120,123 @@ gw:
         - 10.43.192.0/18
   linecards:
     1:
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      kavlan_pattern: Gi%LINECARD%/%PORT%
+      snmp_pattern: Ethernet%LINECARD%/%PORT%
+      kavlan_pattern: Ethernet%LINECARD%/%PORT%
       backplane_bps: 40000000000
       rate: 1000000000
       kind: node
-      ports:
-        35:
-          uid: cronos-eth1
-          kind: server
-        37:
-          uid: cronos-eth2
-          kind: server
-        46:
-#          uid: ul-grid5000-sw02
-#          port: mgmt0
-#          kind: switch
-        48:
-    2:
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      kavlan_pattern: Gi%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 1000000000
-      kind: node
-      ports:
-        44:
-          uid: cronos
-          kind: server
-        48:
-    3:
-      snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
-      kavlan_pattern: Ti%LINECARD%/%PORT%
-      rate: 10000000000
-      backplane_bps: 40000000000
-      kind: channel
       ports:
         1:
-          uid: Port-channel4
+          uid: port-channel1
           kind: channel
         2:
-          uid: Port-channel4
+          uid: port-channel1
+          kind: channel
+        3:
+          uid: port-channel3
           kind: channel
-    5:
-      snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
-      kavlan_pattern: Ti%LINECARD%/%PORT%
-      rate: 1000000000
-      backplane_bps: 40000000000
-      kind: backbone
-      ports:
         4:
+          uid: port-channel3
+          kind: channel
+        5:
+          uid: port-channel5
+          kind: channel
+        6:
+          uid: port-channel5
+          kind: channel
+        7:
+          uid: port-channel7
+          kind: channel
+        8:
+          uid: port-channel7
+          kind: channel
+        41:
+          uid: port-channel41
+          kind: channel
+        42:
+          uid: port-channel41
+          kind: channel
+        43:
+          uid: port-channel43
+          kind: channel
+        44:
+          uid: port-channel43
+          kind: channel
+        45:
+          uid: port-channel45
+          kind: channel
+        46:
+          uid: port-channel45
+          kind: channel
+        48:
           uid: renater-luxembourg
-          rate: 10000000000
+          kind: backbone
+        55:
+          uid: port-channel55
+          kind: channel
+        56:
+          uid: port-channel55
+          kind: channel
+        57:
+          uid: port-channel57
+          kind: channel
+        58:
+          uid: port-channel57
+          kind: channel
+        59:
+          uid: port-channel59
+          kind: channel
+        60:
+          uid: port-channel59
+          kind: channel
   channels:
-    Port-channel4:
-      uid: ul-grid5000-sw02
-      port: port-channel4
+    port-channel1:
+      uid: pve-1
+      port: port-channel1
+      kind: server
+      rate: 20000000000
+    port-channel3:
+      uid: pve-2
+      port: port-channel3
+      kind: server
+      rate: 20000000000
+    port-channel5:
+      uid: pve-1-backup-link
+      port: port-channel5
+      kind: server
+      rate: 20000000000
+    port-channel7:
+      uid: pve-2-backup-link
+      port: port-channel7
+      kind: server
+      rate: 20000000000
+    port-channel41:
+      uid: backup-link-to-hpc-gw
+      port: port-channel7
+      kind: server
+      rate: 20000000000
+    port-channel43:
+      uid: sw-admin-b09
+      port: port-channel43
+      kind: switch
+      rate: 20000000000
+    port-channel45:
+      uid: sw-admin-b04
+      port: port-channel45
+      kind: switch
+      rate: 20000000000
+    port-channel55:
+      uid: srv-data
+      port: port-channel55
+      kind: server
+      rate: 20000000000
+    port-channel57:
+      uid: sw-b09
+      port: port-channel57
+      kind: switch
+      rate: 20000000000
+    port-channel59:
+      uid: sw-b04
+      port: port-channel59
       kind: switch
       rate: 20000000000
diff --git a/input/grid5000/sites/luxembourg/servers/physical.yaml b/input/grid5000/sites/luxembourg/servers/physical.yaml
index f3a2cb9177127e9714e595041ee84e66e1c06d7e..1f024f9fefb23ac5a553c4173f89fa7110a057b3 100644
--- a/input/grid5000/sites/luxembourg/servers/physical.yaml
+++ b/input/grid5000/sites/luxembourg/servers/physical.yaml
@@ -1,29 +1,4 @@
 ---
-cronos:
-  kind: physical
-  redfish: false
-  warranty: 2017-05
-  serial: JSG625J
-  network_adapters:
-    default:
-      ip: 172.16.191.2
-    adm:
-      ip: 172.17.191.2
-    bmc:
-      ip: 172.17.190.2
-
-zeus:
-  kind: physical
-  alias: []
-  warranty: 2016-08
-  serial: 8L6033J
-  network_adapters:
-    default:
-      ip: 172.16.191.60
-    bmc:
-      ip: 172.17.190.60
-      mac: 00:1C:23:BD:F5:B2
-
 srv-data:
   kind: physical
   alias: [nfs, home-g5k, public, ntp, storage1, modules]