diff --git a/data/grid5000/accesses/refrepo.json b/data/grid5000/accesses/refrepo.json
index 88120f7ad4a0bae60ad6acba5df3abcb5f0c4254..9744e793c62f630fc4dd2e46883bd333ee79723e 100644
--- a/data/grid5000/accesses/refrepo.json
+++ b/data/grid5000/accesses/refrepo.json
@@ -1938,22 +1938,23 @@
                 },
                 {
                   "device": "ib0",
-                  "driver": "hfi1",
+                  "driver": "ib_ipoib",
                   "enabled": true,
                   "firmware_version": "1.27.0",
-                  "guid": "0x00117501017102f8",
+                  "guid": "0x0011750901c4706a",
                   "interface": "Omni-Path",
-                  "ip": "172.18.20.18",
                   "kavlan": false,
-                  "mac": "00:11:75:01:01:71:02:f8",
+                  "mac": "80:81:00:02:fe:80:00:00:00:00:00:00:00:11:75:09:01:c4:70:6a",
                   "management": false,
                   "model": "Omni-Path HFI Silicon 100 Series [discrete]",
                   "mountable": true,
                   "mounted": true,
-                  "name": "ib0",
+                  "name": "ibp94s0",
                   "netmask": "255.255.240.0",
                   "network_address": "dahu-18-ib0.grenoble.grid5000.fr",
                   "rate": 100000000000,
+                  "sriov": false,
+                  "sriov_totalvfs": 0,
                   "vendor": "Intel"
                 },
                 {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
index 8d6480e0cc24725b8bda97e5097ff84d53702adc..2c64623bc8a8053e9d7676207899670961f3231a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json
@@ -178,22 +178,23 @@
     },
     {
       "device": "ib0",
-      "driver": "hfi1",
+      "driver": "ib_ipoib",
       "enabled": true,
       "firmware_version": "1.27.0",
-      "guid": "0x00117501017102f8",
+      "guid": "0x0011750901c4706a",
       "interface": "Omni-Path",
-      "ip": "172.18.20.18",
       "kavlan": false,
-      "mac": "00:11:75:01:01:71:02:f8",
+      "mac": "80:81:00:02:fe:80:00:00:00:00:00:00:00:11:75:09:01:c4:70:6a",
       "management": false,
       "model": "Omni-Path HFI Silicon 100 Series [discrete]",
       "mountable": true,
       "mounted": true,
-      "name": "ib0",
+      "name": "ibp94s0",
       "netmask": "255.255.240.0",
       "network_address": "dahu-18-ib0.grenoble.grid5000.fr",
       "rate": 100000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
       "vendor": "Intel"
     },
     {
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
index be3956dddb9de876966accbf10609cd5ec83cdb7..5f0322d781d0fa928ca4f69ccf150e0aa637a28f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
@@ -85,16 +85,17 @@ dahu-18:
       sriov_totalvfs: 0
       vendor: Intel
     ib0:
-      driver: hfi1
+      driver: ib_ipoib
       firmware_version: 1.27.0
-      guid: '0x00117501017102f8'
+      guid: '0x0011750901c4706a'
       interface: Omni-Path
-      ip: 172.18.20.18
-      mac: 00:11:75:01:01:71:02:f8
+      mac: 80:81:00:02:fe:80:00:00:00:00:00:00:00:11:75:09:01:c4:70:6a
       management: false
       model: Omni-Path HFI Silicon 100 Series [discrete]
-      name: ib0
+      name: ibp94s0
       rate: 100000000000
+      sriov: false
+      sriov_totalvfs: 0
       vendor: Intel
   operating_system:
     cstate_driver: intel_idle
diff --git a/lib/refrepo/g5kchecks_importer.rb b/lib/refrepo/g5kchecks_importer.rb
index c485574aca05a57c007056a45894720bfbd77153..4da306972d573051863fa8c3c60b2c0faa3330b2 100644
--- a/lib/refrepo/g5kchecks_importer.rb
+++ b/lib/refrepo/g5kchecks_importer.rb
@@ -1,6 +1,6 @@
 require 'refrepo/hash/hash'
 
-INTERFACE_ORDER = %w(eth0 eth1 eth2 eth3 eth4 eth5 eth6 ib0 ib1 ib2 ib3 ib4 ib5 ib6 ib7 ibs1 bmc eno1 eno2 eno1np0 eno2np1 ens4f0 ens4f1 ens5f0 ens5f1 ens10f0np0 ens10f1np1 ib0.8100)
+INTERFACE_ORDER = %w(eth0 eth1 eth2 eth3 eth4 eth5 eth6 ib0 ib1 ib2 ib3 ib4 ib5 ib6 ib7 ibs1 ibp94s0 bmc eno1 eno2 eno1np0 eno2np1 ens4f0 ens4f1 ens5f0 ens5f1 ens10f0np0 ens10f1np1 ib0.8100)
 
 def g5kchecks_importer(sourcedir)
   puts "Importing source files from #{sourcedir} into input directory..."
diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb
index 77ba5bd29058c6f6602b94f19a97302aa1f55b4d..adfd7b91a42e181313be0691c748315a4e0142d0 100644
--- a/lib/refrepo/gen/reference-api.rb
+++ b/lib/refrepo/gen/reference-api.rb
@@ -144,7 +144,7 @@ def generate_reference_api
         node["storage_devices"] = node["storage_devices"].sort_by{ |_sd, v| v['id'] }.map { |a| a[1] }
 
         node["network_adapters"].each { |key, _hash| node["network_adapters"][key]["device"] = key; } # Add "device: ethX" within the hash
-        node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1","bmc", "eno1", "eno2", "eno1np0", "eno2np1", "ens4f0", "ens4f1", "ens5f0", "ens5f1", "ens10f0np0", "ens10f1np1", "fpga0", "fpga1"]).values
+        node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1", "ibp94s0", "bmc", "eno1", "eno2", "eno1np0", "eno2np1", "ens4f0", "ens4f1", "ens5f0", "ens5f1", "ens10f0np0", "ens10f1np1", "fpga0", "fpga1"]).values
         node["memory_devices"].each { |key, _hash| node["memory_devices"][key]["device"] = key; } # Add "device: dimm_a1" within the hash
         node["memory_devices"] = node["memory_devices"].sort_by { |d, _|
           [d.gsub(/dimm_(\d+)/, '\1').to_i,