diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 87226812c940511fdc1d3f4662e4d07c47744f15..dcc0946dac09f73802e32e112de72da64e501d61 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -11,7 +11,11 @@
     "vendor": "American Megatrends Inc.",
     "version": "R1.00.E4"
   },
-  "bmc_version": "unknown",
+  "bmc": {
+    "ip": "172.17.161.1",
+    "mac": "01:01:01:01:01:01"
+  },
+  "bmc_version": "15.00",
   "chassis": {
     "manufactured_at": "1970-01-01",
     "manufacturer": "Default string",
@@ -66,7 +70,6 @@
       "interface": "Ethernet",
       "ip": "172.17.161.1",
       "kavlan": false,
-      "mac": "01:01:01:01:01:01",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index 9f17caaa67eadf6eea4706a8fbec6384f0fa00af..5ce7c4f57a9ddeec194de6e9fe306af448414d42 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -11,7 +11,11 @@
     "vendor": "American Megatrends Inc.",
     "version": "R1.00.E4"
   },
-  "bmc_version": "unknown",
+  "bmc": {
+    "ip": "172.17.161.2",
+    "mac": "E0:01:A6:A4:4C:FC"
+  },
+  "bmc_version": "15.00",
   "chassis": {
     "manufactured_at": "1970-01-01",
     "manufacturer": "Default string",
@@ -66,7 +70,6 @@
       "interface": "Ethernet",
       "ip": "172.17.161.2",
       "kavlan": false,
-      "mac": "e0:01:a6:a4:4c:fc",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
index 009c1d1c16568563ab6d12019db3831aeeb85f89..2ca5e85dac4e48a9e0cd4d3f0728dae31c6ae319 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -11,7 +11,11 @@
     "vendor": "American Megatrends Inc.",
     "version": "R1.00.E4"
   },
-  "bmc_version": "unknown",
+  "bmc": {
+    "ip": "172.17.161.3",
+    "mac": "E0:01:A6:A4:3A:F0"
+  },
+  "bmc_version": "15.00",
   "chassis": {
     "manufactured_at": "1970-01-01",
     "manufacturer": "Default string",
@@ -66,7 +70,6 @@
       "interface": "Ethernet",
       "ip": "172.17.161.3",
       "kavlan": false,
-      "mac": "e0:01:a6:a4:3a:f0",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
index 830f427bfef78bdb1ef718a27d4d47d4873923b8..cfcedd7e0068984a7ebedde8b0212ecd058cfe65 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -11,7 +11,11 @@
     "vendor": "American Megatrends Inc.",
     "version": "R1.00.E4"
   },
-  "bmc_version": "unknown",
+  "bmc": {
+    "ip": "172.17.161.4",
+    "mac": "E0:01:A6:A4:36:04"
+  },
+  "bmc_version": "15.00",
   "chassis": {
     "manufactured_at": "1970-01-01",
     "manufacturer": "Default string",
@@ -66,7 +70,6 @@
       "interface": "Ethernet",
       "ip": "172.17.161.4",
       "kavlan": false,
-      "mac": "e0:01:a6:a4:36:04",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
index e46bfcf2144039579cf009d8193d3f3fb536c33f..86c9bbf9ddc89b164456a0e037f1f2018b83d30a 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -11,7 +11,11 @@
     "vendor": "American Megatrends Inc.",
     "version": "R1.00.E4"
   },
-  "bmc_version": "unknown",
+  "bmc": {
+    "ip": "172.17.161.5",
+    "mac": "E0:01:A6:A4:3C:08"
+  },
+  "bmc_version": "15.00",
   "chassis": {
     "manufactured_at": "1970-01-01",
     "manufacturer": "Default string",
@@ -66,7 +70,6 @@
       "interface": "Ethernet",
       "ip": "172.17.161.5",
       "kavlan": false,
-      "mac": "e0:01:a6:a4:3c:08",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
index 65cb497f1f6197624420855ea2be58404336d26b..459d0b9eaa8261a65bf9908e681fd046e65aeab3 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -11,7 +11,11 @@
     "vendor": "American Megatrends Inc.",
     "version": "R1.00.E4"
   },
-  "bmc_version": "unknown",
+  "bmc": {
+    "ip": "172.17.161.6",
+    "mac": "E0:01:A6:A4:4B:E4"
+  },
+  "bmc_version": "15.00",
   "chassis": {
     "manufactured_at": "1970-01-01",
     "manufacturer": "Default string",
@@ -66,7 +70,6 @@
       "interface": "Ethernet",
       "ip": "172.17.161.6",
       "kavlan": false,
-      "mac": "e0:01:a6:a4:4b:e4",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
index d2fc6f2f3784735a3bca396b9ade3212b6605480..61177a443d27337f655520cc332cc6f31395477b 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -11,7 +11,11 @@
     "vendor": "American Megatrends Inc.",
     "version": "R1.00.E4"
   },
-  "bmc_version": "unknown",
+  "bmc": {
+    "ip": "172.17.161.7",
+    "mac": "E0:01:A6:A4:49:28"
+  },
+  "bmc_version": "15.00",
   "chassis": {
     "manufactured_at": "1970-01-01",
     "manufacturer": "Default string",
@@ -66,7 +70,6 @@
       "interface": "Ethernet",
       "ip": "172.17.161.7",
       "kavlan": false,
-      "mac": "e0:01:a6:a4:49:28",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
index c4b808a21860cb8cbbad007c3d16d9dba082cf52..2175d8e94a9a3a2e938c9241caa0650eb7b2e8be 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -11,7 +11,11 @@
     "vendor": "American Megatrends Inc.",
     "version": "R1.00.E4"
   },
-  "bmc_version": "unknown",
+  "bmc": {
+    "ip": "172.17.161.8",
+    "mac": "E0:01:A6:A4:3B:7C"
+  },
+  "bmc_version": "15.00",
   "chassis": {
     "manufactured_at": "1970-01-01",
     "manufacturer": "Default string",
@@ -66,7 +70,6 @@
       "interface": "Ethernet",
       "ip": "172.17.161.8",
       "kavlan": false,
-      "mac": "e0:01:a6:a4:3b:7c",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
deleted file mode 100644
index fc5cbe815d90c191bd6e5e94435227454db4c32d..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
----
-model: Switch P4
-created_at: 1970-01-01 # TODO: change this value
-kavlan: false
-boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice)
-exotic: true 
-queues:
-  - admin
-  - testing
-nodes:
-  engelbourg-[1-8]:
-    chassis:
-      manufactured_at: 1970-01-01 # TODO: Put date.
-      warranty_end: 1970-01-01 # TODO: Put date.
-    supported_job_types:
-      deploy: true
-      besteffort: true
-      max_walltime: 0
-    processor:
-      microarchitecture: Broadwell
-      clock_speed: 1600000000
-      model: Intel Pentium
-      version: D1517
-    network_adapters:
-      
-      engelbourg-1:
-        bmc:
-          interface: Ethernet
-          enabled: true
-          mountable: false
-          mounted: false
-          ip: 172.17.161.1
-          mac: 01:01:01:01:01:01
-          management: true
-      
-      engelbourg-2:
-        bmc:
-          interface: Ethernet
-          enabled: true
-          mountable: false
-          mounted: false
-          ip: 172.17.161.2
-          mac: #Fake
-          management: true
-      
-      engelbourg-3:
-        bmc:
-          interface: Ethernet
-          enabled: true
-          mountable: false
-          mounted: false
-          ip: 172.17.161.3
-          mac: value
-          management: true
-      
-      engelbourg-4:
-        bmc:
-          interface: Ethernet
-          enabled: true
-          mountable: false
-          mounted: false
-          ip: 172.17.161.4
-          mac: E0:01:A6:A4:4C:FC
-          management: true
-      
-      engelbourg-5:
-        bmc:
-          interface: Ethernet
-          enabled: true
-          mountable: false
-          mounted: false
-          ip: 172.17.161.5
-          mac: E0:01:A6:A4:3A:F0
-          management: true
-      
-      engelbourg-6:
-        bmc:
-          interface: Ethernet
-          enabled: true
-          mountable: false
-          mounted: false
-          ip: 172.17.161.6
-          mac: E0:01:A6:A4:36:04
-          management: true
-      
-      engelbourg-7:
-        bmc:
-          interface: Ethernet
-          enabled: true
-          mountable: false
-          mounted: false
-          ip: 172.17.161.7
-          mac: E0:01:A6:A4:3C:08
-          management: true
-      
-      engelbourg-8:
-        bmc:
-          interface: Ethernet
-          enabled: true
-          mountable: false
-          mounted: false
-          ip: 172.17.161.8
-          mac: E0:01:A6:A4:4B:E4
-          management: true
-      
-      eth0:
-        enabled: true
-        mountable: true
-        mounted: true
-    storage_devices:
-      pci-0000:00:1f.2-ata-1:
-        id: disk0
-        interface: SATA
-    software:
-      standard-environment: debian11-x64-std # TODO: check that architecture is OK
-    management_tools:
-      bmc_vendor_tool: none
-    nodeset: engelbourg # TODO: rename cluster
-
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml.erb b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml.erb
index 19b45751d43af2947f6d7e6b7d2d4f134e94a287..09b7887083c261e398f27e051050fb8dc946b2ee 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml.erb
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml.erb
@@ -14,7 +14,7 @@
   )
 
   mac_bmc_list = %w(
-    01:01:01:01:01:01 #Fake value
+    01:01:01:01:01:01
     E0:01:A6:A4:4C:FC
     E0:01:A6:A4:3A:F0
     E0:01:A6:A4:36:04
@@ -34,7 +34,13 @@ exotic: true
 queues:
   - admin
   - testing
-nodes:
+nodes: 
+  <% (1..nodes_number).each { |i| %>
+  <%= cluster_name %>-<%= i %>:
+    bmc:   
+      ip: <%= ip_bmc_list[i - 1] %>
+      mac: <%= mac_bmc_list[i - 1] %>
+  <% } %>
   engelbourg-[1-8]:
     chassis:
       manufactured_at: 1970-01-01 # TODO: Put date.
@@ -49,17 +55,12 @@ nodes:
       model: Intel Pentium
       version: D1517
     network_adapters:
-      <% (1..nodes_number).each { |i| %>
-      <%= cluster_name %>-<%= i %>:
-        bmc:
-          interface: Ethernet
-          enabled: true
-          mountable: false
-          mounted: false
-          ip: <%= ip_bmc_list[i - 1] %>
-          mac: <%= mac_bmc_list[i - 1] %>
-          management: true
-      <% } %>
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+        management: true
       eth0:
         enabled: true
         mountable: true
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
index 0dc9b73735b174b0148477961bab0e631d434846..b2de234ce2594ef97ad72568eb9f3d910dbefd05 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.yaml
@@ -11,7 +11,7 @@ engelbourg-1:
     release_date: 02/08/2021
     vendor: American Megatrends Inc.
     version: R1.00.E4
-  bmc_version: unknown
+  bmc_version: '15.00'
   chassis:
     manufacturer: Default string
     name: Default string
@@ -23,10 +23,6 @@ engelbourg-1:
       size: 8589934592
       technology: dram
   network_adapters:
-    bmc:
-      ip: 172.17.161.1
-      mac: 01:01:01:01:01:01 #FAKE VALUE
-      management: true
     eth0:
       driver: igb
       firmware_version: 3.16.0
@@ -55,8 +51,10 @@ engelbourg-1:
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x700001c'
+    model: Intel Pentium
     other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
     vendor: Intel
+    version: D1517
   storage_devices:
     pci-0000:00:1f.2-ata-1:
       by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
index c48a85f676723d0863e28dc1ec355cda32cd968f..55edd187129574be45c1cc596180ed25139c6050 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.yaml
@@ -11,7 +11,7 @@ engelbourg-2:
     release_date: 02/08/2021
     vendor: American Megatrends Inc.
     version: R1.00.E4
-  bmc_version: unknown
+  bmc_version: '15.00'
   chassis:
     manufacturer: Default string
     name: Default string
@@ -23,16 +23,12 @@ engelbourg-2:
       size: 8589934592
       technology: dram
   network_adapters:
-    bmc:
-      ip: 172.17.161.2
-      mac: E0:01:A6:A4:4C:FC
-      management: true
     eth0:
       driver: igb
       firmware_version: 3.16.0
       interface: Ethernet
       ip: 172.16.161.2
-      mac: 00:90:fb:78:0f:12
+      mac: 00:90:FB:78:0F:12
       management: false
       model: I210 Gigabit Network Connection
       name: enp2s0
@@ -55,8 +51,10 @@ engelbourg-2:
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x700001c'
+    model: Intel Pentium
     other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
     vendor: Intel
+    version: D1517
   storage_devices:
     pci-0000:00:1f.2-ata-1:
       by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
index 944a670d222280e916b9732615896b6385cf103f..b29a71a18f7f74f395fac75bebd6b081c1b34de4 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.yaml
@@ -11,7 +11,7 @@ engelbourg-3:
     release_date: 02/08/2021
     vendor: American Megatrends Inc.
     version: R1.00.E4
-  bmc_version: unknown
+  bmc_version: '15.00'
   chassis:
     manufacturer: Default string
     name: Default string
@@ -23,16 +23,12 @@ engelbourg-3:
       size: 8589934592
       technology: dram
   network_adapters:
-    bmc:
-      ip: 172.17.161.3
-      mac: E0:01:A6:A4:3A:F0
-      management: true
     eth0:
       driver: igb
       firmware_version: 3.16.0
       interface: Ethernet
       ip: 172.16.161.3
-      mac: 00:90:fb:78:0f:39
+      mac: 00:90:FB:78:0F:39
       management: false
       model: I210 Gigabit Network Connection
       name: enp2s0
@@ -55,8 +51,10 @@ engelbourg-3:
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x700001c'
+    model: Intel Pentium
     other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
     vendor: Intel
+    version: D1517
   storage_devices:
     pci-0000:00:1f.2-ata-1:
       by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
index 6e7f193c6ecc1bcc3b188c38620a2ddd4e919296..d6158909529da933108714eae4e88b2988e3c85d 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.yaml
@@ -11,7 +11,7 @@ engelbourg-4:
     release_date: 02/08/2021
     vendor: American Megatrends Inc.
     version: R1.00.E4
-  bmc_version: unknown
+  bmc_version: '15.00'
   chassis:
     manufacturer: Default string
     name: Default string
@@ -23,16 +23,12 @@ engelbourg-4:
       size: 8589934592
       technology: dram
   network_adapters:
-    bmc:
-      ip: 172.17.161.4
-      mac: E0:01:A6:A4:36:04
-      management: true
     eth0:
       driver: igb
       firmware_version: 3.16.0
       interface: Ethernet
       ip: 172.16.161.4
-      mac: 00:90:fb:78:0e:d7
+      mac: 00:90:FB:78:0E:D7
       management: false
       model: I210 Gigabit Network Connection
       name: enp2s0
@@ -55,8 +51,10 @@ engelbourg-4:
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x700001c'
+    model: Intel Pentium
     other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
     vendor: Intel
+    version: D1517
   storage_devices:
     pci-0000:00:1f.2-ata-1:
       by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
index 57ab4a93ad905150c68366ee72e487c43af77f68..b19638b83c5146acbba2e09ee00c8b383bc4eeaf 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.yaml
@@ -11,7 +11,7 @@ engelbourg-5:
     release_date: 02/08/2021
     vendor: American Megatrends Inc.
     version: R1.00.E4
-  bmc_version: unknown
+  bmc_version: '15.00'
   chassis:
     manufacturer: Default string
     name: Default string
@@ -23,16 +23,12 @@ engelbourg-5:
       size: 8589934592
       technology: dram
   network_adapters:
-    bmc:
-      ip: 172.17.161.5
-      mac: E0:01:A6:A4:3C:08
-      management: true
     eth0:
       driver: igb
       firmware_version: 3.16.0
       interface: Ethernet
       ip: 172.16.161.5
-      mac: 00:90:fb:78:0f:42
+      mac: 00:90:FB:78:0F:42
       management: false
       model: I210 Gigabit Network Connection
       name: enp2s0
@@ -55,8 +51,10 @@ engelbourg-5:
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x700001c'
+    model: Intel Pentium
     other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
     vendor: Intel
+    version: D1517
   storage_devices:
     pci-0000:00:1f.2-ata-1:
       by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
index c613ada99d2042e65dc369b6f1ca0c12440a3f66..d8c5d00b017d5629ad47a1022224b933b2130322 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.yaml
@@ -11,7 +11,7 @@ engelbourg-6:
     release_date: 02/08/2021
     vendor: American Megatrends Inc.
     version: R1.00.E4
-  bmc_version: unknown
+  bmc_version: '15.00'
   chassis:
     manufacturer: Default string
     name: Default string
@@ -23,16 +23,12 @@ engelbourg-6:
       size: 8589934592
       technology: dram
   network_adapters:
-    bmc:
-      ip: 172.17.161.6
-      mac: E0:01:A6:A4:4B:E4
-      management: true
     eth0:
       driver: igb
       firmware_version: 3.16.0
       interface: Ethernet
       ip: 172.16.161.6
-      mac: 00:90:fb:76:cd:89
+      mac: 00:90:FB:76:CD:89
       management: false
       model: I210 Gigabit Network Connection
       name: enp2s0
@@ -55,8 +51,10 @@ engelbourg-6:
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x700001c'
+    model: Intel Pentium
     other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
     vendor: Intel
+    version: D1517
   storage_devices:
     pci-0000:00:1f.2-ata-1:
       by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
index 13dbe606d66d189a820de4cfc9bd638c6e409256..0d9b5b5670d2fa8b0cb3ed46b5d8529b2071e382 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.yaml
@@ -11,7 +11,7 @@ engelbourg-7:
     release_date: 02/08/2021
     vendor: American Megatrends Inc.
     version: R1.00.E4
-  bmc_version: unknown
+  bmc_version: '15.00'
   chassis:
     manufacturer: Default string
     name: Default string
@@ -23,16 +23,12 @@ engelbourg-7:
       size: 8589934592
       technology: dram
   network_adapters:
-    bmc:
-      ip: 172.17.161.7
-      mac: E0:01:A6:A4:49:28
-      management: true
     eth0:
       driver: igb
       firmware_version: 3.16.0
       interface: Ethernet
       ip: 172.16.161.7
-      mac: 00:90:fb:76:cd:8a
+      mac: 00:90:FB:76:CD:8A
       management: false
       model: I210 Gigabit Network Connection
       name: enp2s0
@@ -55,8 +51,10 @@ engelbourg-7:
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x700001c'
+    model: Intel Pentium
     other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
     vendor: Intel
+    version: D1517
   storage_devices:
     pci-0000:00:1f.2-ata-1:
       by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
index 5890f6ccc02a0dbf3fbf9ed9027b2041a60229ba..215ee52c2ebdb6a2e1fa19b0452af5a90bc98b90 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.yaml
@@ -11,7 +11,7 @@ engelbourg-8:
     release_date: 02/08/2021
     vendor: American Megatrends Inc.
     version: R1.00.E4
-  bmc_version: unknown
+  bmc_version: '15.00'
   chassis:
     manufacturer: Default string
     name: Default string
@@ -23,10 +23,6 @@ engelbourg-8:
       size: 8589934592
       technology: dram
   network_adapters:
-    bmc:
-      ip: 172.17.161.8
-      mac: E0:01:A6:A4:3B:7C
-      management: true
     eth0:
       driver: igb
       firmware_version: 3.16.0
@@ -55,8 +51,10 @@ engelbourg-8:
     ht_capable: true
     instruction_set: x86-64
     microcode: '0x700001c'
+    model: Intel Pentium
     other_description: Intel(R) Pentium(R) CPU D1517 @ 1.60GHz
     vendor: Intel
+    version: D1517
   storage_devices:
     pci-0000:00:1f.2-ata-1:
       by_id: "/dev/disk/by-id/wwn-0x502b2a201d1c1b1a"