diff --git a/data/grid5000/sites/lille/clusters/chiconade1/chiconade1.json b/data/grid5000/sites/lille/clusters/chiconade1/chiconade1.json
index 77be3bc511212eac7361015f113be51323bcf775..8c0b18e0ea7f2cf72bbd5172679571d98820c911 100644
--- a/data/grid5000/sites/lille/clusters/chiconade1/chiconade1.json
+++ b/data/grid5000/sites/lille/clusters/chiconade1/chiconade1.json
@@ -76,6 +76,182 @@
         "port": 9400,
         "protocol": "prometheus"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_discard_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_discard_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_error_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_error_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_packets_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_packets_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_packets_discard_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_packets_discard_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_packets_error_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_packets_error_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "ProLiant DL320 Gen11",
diff --git a/data/grid5000/sites/lille/clusters/chiconade1/nodes/chiconade1-1.json b/data/grid5000/sites/lille/clusters/chiconade1/nodes/chiconade1-1.json
index 34d5036eb1d5ea7e7d0dacdea9dba15585ae8780..4f0ea942f38353235416a61dd5620afa3702427c 100644
--- a/data/grid5000/sites/lille/clusters/chiconade1/nodes/chiconade1-1.json
+++ b/data/grid5000/sites/lille/clusters/chiconade1/nodes/chiconade1-1.json
@@ -90,8 +90,8 @@
       "rate": 25000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-chiclet-1",
+      "switch_port": "Ethernet1/33",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
@@ -113,8 +113,8 @@
       "rate": 25000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-chiclet-1",
+      "switch_port": "Ethernet1/34",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index e2a5b1141093db1a8b53b9adf630b74331fa0c82..a9bf34737d4fc6e542dd494c474579d489a7ae06 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
@@ -127,7 +127,7 @@ sw-chiclet-1:
         32:
           uid: chiclet-8-eth1
         33: 
-          uid: chiconade1-1-eth0
+          uid: chiconade1-1
         34: 
           uid: chiconade1-1-eth1
         53:
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index 12c58709c5a0fc5af19fd02c6eec00be4b219963..8a5e7675b2946243a6a4d6986fd5ca74b166cc79 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -364,8 +364,8 @@ def net_switch_port_lookup(site, node_uid, interface='')
           switch_remote_port = lc["port"] || ""
           switch_remote_uid = port
         end
-        if switch_remote_uid =~ /([a-z]*-[0-9]*)-(.*)/
-          n, p = switch_remote_uid.match(/([a-z]*-[0-9]*)-(.*)/).captures
+        if switch_remote_uid =~ /([a-z]+[0-9]*-[0-9]*)-(.*)/
+          n, p = switch_remote_uid.match(/([a-z]+[0-9]*-[0-9]*)-(.*)/).captures
           switch_remote_uid = n
           switch_remote_port = p
         end