diff --git a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
index 13882cd859a6dfef3d79d51280b2a3f7b6d948fa..d474b764cb2a2651ac344f45bd5b4fbe49a170ac 100644
--- a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json
@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw",
-      "switch_port": "ethernet1/1/81:1",
+      "switch_port": "ethernet1/1/81",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
index aa1587a882a22241441055fee232ca07c44ba034..d441e8462fe7043f174ee8114e8f9359bf76f5b2 100644
--- a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json
@@ -132,7 +132,7 @@
       "sriov": false,
       "sriov_totalvfs": 0,
       "switch": "gw",
-      "switch_port": "ethernet1/1/82:1",
+      "switch_port": "ethernet1/1/82",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index 53ebacf43bdd0054a26d32fb100e93eb7dd9b0c8..d1d2167f984f192ffbc77877cadc46ab4cc29b8e 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -414,14 +414,14 @@
           "kind": "node",
           "port": "eth0",
           "rate": 25000000000,
-          "snmp_name": "ethernet1/1/81:1",
+          "snmp_name": "ethernet1/1/81",
           "uid": "servan-1"
         },
         {
           "kind": "node",
           "port": "eth0",
           "rate": 25000000000,
-          "snmp_name": "ethernet1/1/82:1",
+          "snmp_name": "ethernet1/1/82",
           "uid": "servan-2"
         },
         {
diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
index cf8c99c4e5b611435e21c04f1d1c4efc88fa5a0f..d44dae773f538d501fffdf3cc3d133830a0f5df3 100644
--- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -189,9 +189,11 @@ gw:
           rate: 25000000000
         81:
           uid: servan-1
+          snmp_pattern: "ethernet1/1/%PORT%"
           rate: 25000000000
         82:
           uid: servan-2
+          snmp_pattern: "ethernet1/1/%PORT%"
           rate: 25000000000
         83:
           uid: port-channel10