diff --git a/data/grid5000/sites/nancy/network_equipments/gw-next.json b/data/grid5000/sites/nancy/network_equipments/gw-next.json
index c304782847ad227684437b2f9be2be2a44a5c0bc..a69c4878e932354021c898cca4394ac2787842c5 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-next.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-next.json
@@ -300,5 +300,6 @@
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
-  "uid": "gw-next"
+  "uid": "gw-next",
+  "warranty": "2048-08-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
index b7aed43fef046e6117e5e5dd49de842c720b240f..418666ec258555585060a220fc42883c0e7180ee 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
@@ -210,9 +210,10 @@
     }
   ],
   "model": "Dell S5224F-ON",
+  "serial": "DCKD9Z2",
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sgrappe",
-  "warranty": "2025-08-07"
+  "warranty": "2025-08-08"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros1.json b/data/grid5000/sites/nancy/network_equipments/sgros1.json
index 4985c11360a00276fa82805cae75fe0d9c13291c..bacd6f3db7ea59e44ff2cb9d2f49753b9e5a7eae 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros1.json
@@ -1217,6 +1217,7 @@
     }
   ],
   "model": "Dell Z9264F-ON",
+  "serial": "HPBWNK2",
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json
index 99c025b7cfebdd821c79ee7572c02355503599b2..09713fce1a566880374204523f1b9c085703662d 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros2.json
@@ -1225,6 +1225,7 @@
     }
   ],
   "model": "Dell Z9264F-ON",
+  "serial": "8PBWNK2",
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgruss.json b/data/grid5000/sites/nancy/network_equipments/sgruss.json
index c511d27fe2813194fa793a963640ead40cd84b72..58ada8051e98a4d068365c124af5e6a05bc9bac5 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgruss.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgruss.json
@@ -178,9 +178,10 @@
     }
   ],
   "model": "Dell S5224F-ON",
+  "serial": "D34Q363",
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sgruss",
-  "warranty": "2026-08-02"
+  "warranty": "2028-07-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index 330dc81e160bb6d7549e7f0f67da24ea0a2ff68e..94e28ce52f6331d6741ea269d4f3ccdac92617cb 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -647,9 +647,10 @@
     }
   ],
   "model": "Dell S4048",
+  "serial": "27PQPK2",
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sgrvingt",
-  "warranty": "2023-03-27"
+  "warranty": "2023-03-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/grvingt-srv.json b/data/grid5000/sites/nancy/servers/grvingt-srv.json
index 7e3dd3c9b407c63712b25770a800c64643d4f7dc..7931cb0e032211317004e1c5f204094350a1d10c 100644
--- a/data/grid5000/sites/nancy/servers/grvingt-srv.json
+++ b/data/grid5000/sites/nancy/servers/grvingt-srv.json
@@ -28,5 +28,5 @@
   "serial": "8WQDDP2",
   "type": "server",
   "uid": "grvingt-srv",
-  "warranty": "2025-03"
+  "warranty": "2025-04-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/pve-1.json b/data/grid5000/sites/nancy/servers/pve-1.json
index a522362fb0d3e9633b213885ae04a2972decf6af..11eefd1b54a058beb5b7b1023ae38028f102552d 100644
--- a/data/grid5000/sites/nancy/servers/pve-1.json
+++ b/data/grid5000/sites/nancy/servers/pve-1.json
@@ -30,5 +30,6 @@
   "redfish": true,
   "serial": "CZJ24220C6",
   "type": "server",
-  "uid": "pve-1"
+  "uid": "pve-1",
+  "warranty": "2029-12-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/pve-2.json b/data/grid5000/sites/nancy/servers/pve-2.json
index fb43d7fa2dbc9a3c6a22749adfea8cb9291f4718..8fc4ce12f4b814684d4c066dac70fad8c53450e9 100644
--- a/data/grid5000/sites/nancy/servers/pve-2.json
+++ b/data/grid5000/sites/nancy/servers/pve-2.json
@@ -19,5 +19,6 @@
   "redfish": true,
   "serial": "CZJD1200CJ",
   "type": "server",
-  "uid": "pve-2"
+  "uid": "pve-2",
+  "warranty": "2031-05-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/srv-data3.json b/data/grid5000/sites/nancy/servers/srv-data3.json
index f69ed8dedeb2d2aac4a5a582cf96d15d3a292905..4e0410849cb00f442d31bc4f5994c21bc7362988 100644
--- a/data/grid5000/sites/nancy/servers/srv-data3.json
+++ b/data/grid5000/sites/nancy/servers/srv-data3.json
@@ -22,5 +22,5 @@
   "serial": "CZ224902J9",
   "type": "server",
   "uid": "srv-data3",
-  "warranty": "2029-12"
+  "warranty": "2028-12-08"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/srv3.json b/data/grid5000/sites/nancy/servers/srv3.json
index 366f19f62d93ef1a70d55ca0f1381f6f696317ea..9d3a3c08e7955c9f0ceba67edc52ed7292f9da03 100644
--- a/data/grid5000/sites/nancy/servers/srv3.json
+++ b/data/grid5000/sites/nancy/servers/srv3.json
@@ -30,5 +30,5 @@
   "serial": "FKHBSY2",
   "type": "server",
   "uid": "srv3",
-  "warranty": "2026-07"
+  "warranty": "2026-07-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/talc-data2.json b/data/grid5000/sites/nancy/servers/talc-data2.json
index a3e17c73d3dabe0e769249c97f5745653033f22c..906e97043746975fb6f42f729b418fceae036402 100644
--- a/data/grid5000/sites/nancy/servers/talc-data2.json
+++ b/data/grid5000/sites/nancy/servers/talc-data2.json
@@ -22,5 +22,5 @@
   "serial": "DK7R9X2",
   "type": "server",
   "uid": "talc-data2",
-  "warranty": "2026-05"
+  "warranty": "2026-05-28"
 }
\ No newline at end of file
diff --git a/input/grid5000/sites/nancy/networks/gw-next.yaml b/input/grid5000/sites/nancy/networks/gw-next.yaml
index ec971baba2c92b605170aee943cfd98f1748f8f6..c55dbc3b39d30380f7b90df1ca89e813df0488ba 100644
--- a/input/grid5000/sites/nancy/networks/gw-next.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-next.yaml
@@ -1,6 +1,7 @@
 ---
 gw-next:
   model: Aruba 8325-48Y8C JL635A
+  warranty: 2048-08-18
   serial: TW32KM007R
   kind: switch
   managed_by_us: true
diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml
index 83e273e2bab019286b4ad11b00a66ee8a9852d89..5a7949a96c15243ce17bb4dcddd5d516cd84309e 100644
--- a/input/grid5000/sites/nancy/networks/sgrappe.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml
@@ -1,7 +1,8 @@
 ---
 sgrappe:
   model: Dell S5224F-ON
-  warranty: "2025-08-07"
+  serial: DCKD9Z2
+  warranty: 2025-08-08
   kind: switch
   managed_by_us: true
   site: nancy
diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml
index daee63190473621f0eda29aa57b2b0aeb0cd238a..c9e7e066972a04b88d8e275280fab5d749ed7d0b 100644
--- a/input/grid5000/sites/nancy/networks/sgros1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros1.yaml
@@ -1,7 +1,8 @@
 ---
 sgros1:
   model: Dell Z9264F-ON
-  warranty: "2026-07-11"
+  serial: HPBWNK2
+  warranty: 2026-07-11
   kind: switch
   managed_by_us: true
   site: nancy
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
index 6ba234f63629549867b2237f0a973909f684ec17..ade171b7964f98d536d501874a3c155076ca8186 100644
--- a/input/grid5000/sites/nancy/networks/sgros2.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -1,7 +1,8 @@
 ---
 sgros2:
   model: Dell Z9264F-ON
-  warranty: "2026-07-11"
+  serial: 8PBWNK2
+  warranty: 2026-07-11
   kind: switch
   managed_by_us: true
   site: nancy
diff --git a/input/grid5000/sites/nancy/networks/sgruss.yaml b/input/grid5000/sites/nancy/networks/sgruss.yaml
index aea00871d3501856d28ed3d007d3c19f0d9133ef..52864c2c8573f658c3d2edbe3c40ae5e7cdbae85 100644
--- a/input/grid5000/sites/nancy/networks/sgruss.yaml
+++ b/input/grid5000/sites/nancy/networks/sgruss.yaml
@@ -1,7 +1,8 @@
 ---
 sgruss:
   model: Dell S5224F-ON
-  warranty: "2026-08-02"
+  serial: D34Q363
+  warranty: 2028-07-29
   kind: switch
   managed_by_us: true
   site: nancy
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index 52923dd322eb99b685557a450bd474e4f4845513..bd7e91509df26ec012169212cee6e7619adfde37 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -1,7 +1,8 @@
 ---
 sgrvingt:
   model: Dell S4048
-  warranty: "2023-03-27"
+  serial: 27PQPK2
+  warranty: 2023-03-28
   kind: switch
   managed_by_us: true
   site: nancy
diff --git a/input/grid5000/sites/nancy/servers/physical.yaml b/input/grid5000/sites/nancy/servers/physical.yaml
index 9ff97c4f1576634e6c5335f476b24ebaa5f86e2b..ec55dbbbbc795fa4dc127ef0c295daaf91c33720 100644
--- a/input/grid5000/sites/nancy/servers/physical.yaml
+++ b/input/grid5000/sites/nancy/servers/physical.yaml
@@ -59,7 +59,7 @@ grvingt-srv:
   kind: physical
   alias:
     - storage5
-  warranty: 2025-03
+  warranty: 2025-04-01
   serial: 8WQDDP2
   network_adapters:
     default:
@@ -81,7 +81,7 @@ talc-data2:
   kind: physical
   alias:
     - storage1
-  warranty: 2026-05
+  warranty: 2026-05-28
   serial: DK7R9X2
   network_adapters:
     default:
@@ -99,7 +99,7 @@ srv-data3:
   kind: physical
   alias:
     - storage4
-  warranty: 2029-12
+  warranty: 2028-12-08
   serial: CZ224902J9
   network_adapters:
     default:
@@ -116,7 +116,7 @@ srv-data3:
 srv3:
   kind: physical
   alias: []
-  warranty: 2026-07
+  warranty: 2026-07-29
   serial: FKHBSY2
   network_adapters:
     default:
@@ -137,6 +137,7 @@ pve-1:
   kind: physical
   alias: [ntp, adminfront]
   serial: CZJ24220C6
+  warranty: 2029-12-13
   network_adapters:
     default:
       mac: 30:3e:a7:00:c8:28
@@ -156,6 +157,7 @@ pve-2:
   kind: physical
   alias: []
   serial: CZJD1200CJ
+  warranty: 2031-05-30
   network_adapters:
     default:
       mac: d4:04:e6:41:96:78