diff --git a/data/grid5000/sites/nancy/network_equipments/gw-next.json b/data/grid5000/sites/nancy/network_equipments/gw-next.json
index edc1eb95f9a9940d6f6fd216e2d7fffce799a77f..29a42535d7d78b86c8825545b334510d62af92af 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-next.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-next.json
@@ -127,10 +127,12 @@
         },
         {
         },
+        {
+        },
         {
           "kind": "switch",
           "rate": 40000000000,
-          "snmp_name": "1/1/52",
+          "snmp_name": "1/1/53",
           "uid": "sgrvingt"
         }
       ],
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index 2e925ec7cfad98132afd9c17f5ed3f91292a992c..cce26b2e726debf17b86b7b1b580cef5645d874a 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -299,7 +299,7 @@
         {
           "kind": "switch",
           "rate": 40000000000,
-          "snmp_name": "TenGigabitEthernet 1/54",
+          "snmp_name": "fortyGigE 1/54",
           "uid": "gw-next"
         }
       ],
diff --git a/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json b/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json
deleted file mode 100644
index 88a512524ff17e06c22daebfda802937368a486b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ip": "172.17.79.220",
-  "mac": "00:C0:B7:E3:22:41",
-  "model": "AP8886",
-  "type": "pdu",
-  "uid": "grvingt-pdu1",
-  "vendor": "APC"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json b/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json
deleted file mode 100644
index 819516fdc8440ed13ba505d3fe2ee4dc0a8d1e12..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ip": "172.17.79.221",
-  "mac": "00:C0:B7:E2:B6:68",
-  "model": "AP8886",
-  "type": "pdu",
-  "uid": "grvingt-pdu2",
-  "vendor": "APC"
-}
\ 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 e5c2fce23dad8d0a86f333818c359bc9975662f2..bfc721a14e967208e7e01573c5837a73eaf1a952 100644
--- a/input/grid5000/sites/nancy/networks/gw-next.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-next.yaml
@@ -24,7 +24,7 @@ gw-next:
           uid: sgros1
           kind: switch
           rate: 40_000_000_000
-        52:
+        53:
           uid: sgrvingt
           kind: switch
           rate: 40_000_000_000
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index a7a8f14cadf71afb4ee2af89ae368388c859927a..38dc674c05c29bb10d3c65d4df9811623b75efdf 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -113,6 +113,7 @@ sgrvingt:
         47: grvingt-45
         54:
           uid: gw-next
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
           rate: 40_000_000_000
           kind: switch
     49:
diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml
index 0b54ed56953deffc0fe3966aae100d60898072c6..74dff979f9b157fda03328e7d77e637c70b2d54f 100644
--- a/input/grid5000/sites/nancy/pdus.yaml
+++ b/input/grid5000/sites/nancy/pdus.yaml
@@ -1,9 +1,5 @@
 ---
 pdus:
-  grvingt-pdu[1-2]:
-    vendor: APC
-    model: AP8886
-
   graoully-pdu[1-2]:
     vendor: APC
     model: AP8653
@@ -78,14 +74,6 @@ pdus:
     ip: 172.17.79.219
     mac: 00:C0:B7:F2:27:DE
 
-  grvingt-pdu1:
-    ip: 172.17.79.220
-    mac: 00:C0:B7:E3:22:41
-
-  grvingt-pdu2:
-    ip: 172.17.79.221
-    mac: 00:C0:B7:E2:B6:68
-
   graffiti-pdu1:
     ip: 172.17.79.226
     mac: 28:29:86:0B:3B:06