diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
index ff0f728f91f5ebe917b3b8159dd4006720a0f8ed..6494005f5d23d894b42d730711e5ceeeb96b719f 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
@@ -3,7 +3,7 @@
     "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
-    "nb_threads": 32,
+    "nb_threads": 64,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -105,32 +105,32 @@
     },
     {
       "device": "eth1",
-      "driver": "igb",
+      "driver": "i40e",
       "enabled": false,
-      "firmware_version": "1.67, 0x80000fa8, 19.0.12",
+      "firmware_version": "7.10 0x8000519f 19.0.12",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "e4:43:4b:a5:71:fc",
+      "mac": "e4:43:4b:a5:71:de",
       "management": false,
-      "model": "I350 Gigabit Network Connection",
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno3",
+      "name": "eno2",
       "vendor": "Intel"
     },
     {
       "device": "eth2",
-      "driver": "i40e",
+      "driver": "igb",
       "enabled": false,
-      "firmware_version": "7.10 0x8000519f 19.0.12",
+      "firmware_version": "1.67, 0x80000fa8, 19.0.12",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "e4:43:4b:a5:71:de",
+      "mac": "e4:43:4b:a5:71:fc",
       "management": false,
-      "model": "Ethernet Controller X710 for 10GbE SFP+",
+      "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "name": "eno2",
+      "name": "eno3",
       "vendor": "Intel"
     },
     {
@@ -164,7 +164,7 @@
   "operating_system": {
     "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "acpi-cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
index 938f4311f464b9fd6a16e109c5c4db73a5385d64..6fbd4175cf9b75ffd42407bf72f2177aba473eba 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
@@ -3,7 +3,7 @@
     "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
-    "nb_threads": 32,
+    "nb_threads": 64,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -105,32 +105,32 @@
     },
     {
       "device": "eth1",
-      "driver": "igb",
+      "driver": "i40e",
       "enabled": false,
-      "firmware_version": "1.67, 0x80000fa8, 19.0.12",
+      "firmware_version": "7.10 0x8000519f 19.0.12",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "e4:43:4b:a5:b1:30",
+      "mac": "e4:43:4b:a5:b1:12",
       "management": false,
-      "model": "I350 Gigabit Network Connection",
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno3",
+      "name": "eno2",
       "vendor": "Intel"
     },
     {
       "device": "eth2",
-      "driver": "i40e",
+      "driver": "igb",
       "enabled": false,
-      "firmware_version": "7.10 0x8000519f 19.0.12",
+      "firmware_version": "1.67, 0x80000fa8, 19.0.12",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "e4:43:4b:a5:b1:12",
+      "mac": "e4:43:4b:a5:b1:30",
       "management": false,
-      "model": "Ethernet Controller X710 for 10GbE SFP+",
+      "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "name": "eno2",
+      "name": "eno3",
       "vendor": "Intel"
     },
     {
@@ -164,7 +164,7 @@
   "operating_system": {
     "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "acpi-cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
index b9f3abd5e367e1f84fe7fd26ca7b2f8d571ccc2b..1f1876ec7e17079ef1d32b4c3ea0f6926f6f2a2f 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
@@ -3,7 +3,7 @@
     "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
-    "nb_threads": 32,
+    "nb_threads": 64,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -105,32 +105,32 @@
     },
     {
       "device": "eth1",
-      "driver": "igb",
+      "driver": "i40e",
       "enabled": false,
-      "firmware_version": "1.67, 0x80000fa8, 19.0.12",
+      "firmware_version": "7.10 0x8000519f 19.0.12",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "e4:43:4b:a4:4a:1a",
+      "mac": "e4:43:4b:a4:49:fc",
       "management": false,
-      "model": "I350 Gigabit Network Connection",
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno3",
+      "name": "eno2",
       "vendor": "Intel"
     },
     {
       "device": "eth2",
-      "driver": "i40e",
+      "driver": "igb",
       "enabled": false,
-      "firmware_version": "7.10 0x8000519f 19.0.12",
+      "firmware_version": "1.67, 0x80000fa8, 19.0.12",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "e4:43:4b:a4:49:fc",
+      "mac": "e4:43:4b:a4:4a:1a",
       "management": false,
-      "model": "Ethernet Controller X710 for 10GbE SFP+",
+      "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "name": "eno2",
+      "name": "eno3",
       "vendor": "Intel"
     },
     {
@@ -164,7 +164,7 @@
   "operating_system": {
     "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "acpi-cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
index 5d5aa8220219cbf4a30737af39c1b018f7372571..a67913577cec0c4fab9c367f3fd4e771b13426f3 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
@@ -3,7 +3,7 @@
     "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
-    "nb_threads": 32,
+    "nb_threads": 64,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -105,32 +105,32 @@
     },
     {
       "device": "eth1",
-      "driver": "igb",
+      "driver": "i40e",
       "enabled": false,
-      "firmware_version": "1.67, 0x80000fa8, 19.0.12",
+      "firmware_version": "7.10 0x8000519f 19.0.12",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "e4:43:4b:a5:4f:d8",
+      "mac": "e4:43:4b:a5:4f:ba",
       "management": false,
-      "model": "I350 Gigabit Network Connection",
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno3",
+      "name": "eno2",
       "vendor": "Intel"
     },
     {
       "device": "eth2",
-      "driver": "i40e",
+      "driver": "igb",
       "enabled": false,
-      "firmware_version": "7.10 0x8000519f 19.0.12",
+      "firmware_version": "1.67, 0x80000fa8, 19.0.12",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "e4:43:4b:a5:4f:ba",
+      "mac": "e4:43:4b:a5:4f:d8",
       "management": false,
-      "model": "Ethernet Controller X710 for 10GbE SFP+",
+      "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "name": "eno2",
+      "name": "eno3",
       "vendor": "Intel"
     },
     {
@@ -164,7 +164,7 @@
   "operating_system": {
     "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "acpi-cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
index 379bfed798025005df7a8b9ac0acad27d5d512d8..969d56e8f1ef40a03686396f7ed4f10e55b313b5 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
@@ -3,7 +3,7 @@
     "cpu_core_numbering": "round-robin",
     "nb_cores": 32,
     "nb_procs": 2,
-    "nb_threads": 32,
+    "nb_threads": 64,
     "platform_type": "x86_64"
   },
   "bios": {
@@ -105,32 +105,32 @@
     },
     {
       "device": "eth1",
-      "driver": "igb",
+      "driver": "i40e",
       "enabled": false,
-      "firmware_version": "1.67, 0x80000fa8, 19.0.12",
+      "firmware_version": "7.10 0x8000519f 19.0.12",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "e4:43:4b:a4:03:0c",
+      "mac": "e4:43:4b:a4:02:ee",
       "management": false,
-      "model": "I350 Gigabit Network Connection",
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno3",
+      "name": "eno2",
       "vendor": "Intel"
     },
     {
       "device": "eth2",
-      "driver": "i40e",
+      "driver": "igb",
       "enabled": false,
-      "firmware_version": "7.10 0x8000519f 19.0.12",
+      "firmware_version": "1.67, 0x80000fa8, 19.0.12",
       "interface": "Ethernet",
       "kavlan": false,
-      "mac": "e4:43:4b:a4:02:ee",
+      "mac": "e4:43:4b:a4:03:0c",
       "management": false,
-      "model": "Ethernet Controller X710 for 10GbE SFP+",
+      "model": "I350 Gigabit Network Connection",
       "mountable": false,
       "mounted": false,
-      "name": "eno2",
+      "name": "eno3",
       "vendor": "Intel"
     },
     {
@@ -164,7 +164,7 @@
   "operating_system": {
     "cstate_driver": "acpi_idle",
     "cstate_governor": "menu",
-    "ht_enabled": false,
+    "ht_enabled": true,
     "pstate_driver": "acpi-cpufreq",
     "pstate_governor": "performance",
     "turboboost_enabled": true
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
index 2fb8f1b1246277211925d3518d1c056204f10493..0437ee9116b30eda2dcd1334eaa92403c0aea06d 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
@@ -5,7 +5,7 @@ grue-1:
     cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
-    nb_threads: 32
+    nb_threads: 64
     platform_type: x86_64
   bios:
     release_date: '08/15/2019'
@@ -68,15 +68,6 @@ grue-1:
       rate: 10000000000
       vendor: Intel
     eth1:
-      driver: igb
-      firmware_version: 1.67, 0x80000fa8, 19.0.12
-      interface: Ethernet
-      mac: e4:43:4b:a5:71:fc
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      vendor: Intel
-    eth2:
       driver: i40e
       firmware_version: 7.10 0x8000519f 19.0.12
       interface: Ethernet
@@ -85,6 +76,15 @@ grue-1:
       model: Ethernet Controller X710 for 10GbE SFP+
       name: eno2
       vendor: Intel
+    eth2:
+      driver: igb
+      firmware_version: 1.67, 0x80000fa8, 19.0.12
+      interface: Ethernet
+      mac: e4:43:4b:a5:71:fc
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno3
+      vendor: Intel
     eth3:
       driver: igb
       firmware_version: 1.67, 0x80000fa8, 19.0.12
@@ -97,7 +97,7 @@ grue-1:
   operating_system:
     cstate_driver: acpi_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: acpi-cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
index fe85869b650da7efd78233c0a6a64d104458ebd3..ef98c6b292cf92769f61848aa0c60ab9c4bc8298 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
@@ -5,7 +5,7 @@ grue-2:
     cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
-    nb_threads: 32
+    nb_threads: 64
     platform_type: x86_64
   bios:
     release_date: '08/15/2019'
@@ -68,15 +68,6 @@ grue-2:
       rate: 10000000000
       vendor: Intel
     eth1:
-      driver: igb
-      firmware_version: 1.67, 0x80000fa8, 19.0.12
-      interface: Ethernet
-      mac: e4:43:4b:a5:b1:30
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      vendor: Intel
-    eth2:
       driver: i40e
       firmware_version: 7.10 0x8000519f 19.0.12
       interface: Ethernet
@@ -85,6 +76,15 @@ grue-2:
       model: Ethernet Controller X710 for 10GbE SFP+
       name: eno2
       vendor: Intel
+    eth2:
+      driver: igb
+      firmware_version: 1.67, 0x80000fa8, 19.0.12
+      interface: Ethernet
+      mac: e4:43:4b:a5:b1:30
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno3
+      vendor: Intel
     eth3:
       driver: igb
       firmware_version: 1.67, 0x80000fa8, 19.0.12
@@ -97,7 +97,7 @@ grue-2:
   operating_system:
     cstate_driver: acpi_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: acpi-cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
index 958b078ae2f93d4f73835b4a45a41b8dd726b4ea..61de32b4e26bb51ec7b27ab51a81efdc354f00ef 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
@@ -5,7 +5,7 @@ grue-3:
     cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
-    nb_threads: 32
+    nb_threads: 64
     platform_type: x86_64
   bios:
     release_date: '08/15/2019'
@@ -68,15 +68,6 @@ grue-3:
       rate: 10000000000
       vendor: Intel
     eth1:
-      driver: igb
-      firmware_version: 1.67, 0x80000fa8, 19.0.12
-      interface: Ethernet
-      mac: e4:43:4b:a4:4a:1a
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      vendor: Intel
-    eth2:
       driver: i40e
       firmware_version: 7.10 0x8000519f 19.0.12
       interface: Ethernet
@@ -85,6 +76,15 @@ grue-3:
       model: Ethernet Controller X710 for 10GbE SFP+
       name: eno2
       vendor: Intel
+    eth2:
+      driver: igb
+      firmware_version: 1.67, 0x80000fa8, 19.0.12
+      interface: Ethernet
+      mac: e4:43:4b:a4:4a:1a
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno3
+      vendor: Intel
     eth3:
       driver: igb
       firmware_version: 1.67, 0x80000fa8, 19.0.12
@@ -97,7 +97,7 @@ grue-3:
   operating_system:
     cstate_driver: acpi_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: acpi-cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
index 61fee87eaf296015321c127aee1af596c3e0bb19..2855e0a375bc32157bdb8396f307b9b65a1803af 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
@@ -5,7 +5,7 @@ grue-4:
     cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
-    nb_threads: 32
+    nb_threads: 64
     platform_type: x86_64
   bios:
     release_date: '08/15/2019'
@@ -68,15 +68,6 @@ grue-4:
       rate: 10000000000
       vendor: Intel
     eth1:
-      driver: igb
-      firmware_version: 1.67, 0x80000fa8, 19.0.12
-      interface: Ethernet
-      mac: e4:43:4b:a5:4f:d8
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      vendor: Intel
-    eth2:
       driver: i40e
       firmware_version: 7.10 0x8000519f 19.0.12
       interface: Ethernet
@@ -85,6 +76,15 @@ grue-4:
       model: Ethernet Controller X710 for 10GbE SFP+
       name: eno2
       vendor: Intel
+    eth2:
+      driver: igb
+      firmware_version: 1.67, 0x80000fa8, 19.0.12
+      interface: Ethernet
+      mac: e4:43:4b:a5:4f:d8
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno3
+      vendor: Intel
     eth3:
       driver: igb
       firmware_version: 1.67, 0x80000fa8, 19.0.12
@@ -97,7 +97,7 @@ grue-4:
   operating_system:
     cstate_driver: acpi_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: acpi-cpufreq
     pstate_governor: performance
     turboboost_enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
index a931d233efd979b241a98f9567e3a9eac5ca78b4..8f362a1b159a38ff10c45ce7dc8330eaf965fbaa 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
@@ -5,7 +5,7 @@ grue-5:
     cpu_core_numbering: round-robin
     nb_cores: 32
     nb_procs: 2
-    nb_threads: 32
+    nb_threads: 64
     platform_type: x86_64
   bios:
     release_date: '08/15/2019'
@@ -68,15 +68,6 @@ grue-5:
       rate: 10000000000
       vendor: Intel
     eth1:
-      driver: igb
-      firmware_version: 1.67, 0x80000fa8, 19.0.12
-      interface: Ethernet
-      mac: e4:43:4b:a4:03:0c
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      vendor: Intel
-    eth2:
       driver: i40e
       firmware_version: 7.10 0x8000519f 19.0.12
       interface: Ethernet
@@ -85,6 +76,15 @@ grue-5:
       model: Ethernet Controller X710 for 10GbE SFP+
       name: eno2
       vendor: Intel
+    eth2:
+      driver: igb
+      firmware_version: 1.67, 0x80000fa8, 19.0.12
+      interface: Ethernet
+      mac: e4:43:4b:a4:03:0c
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno3
+      vendor: Intel
     eth3:
       driver: igb
       firmware_version: 1.67, 0x80000fa8, 19.0.12
@@ -97,7 +97,7 @@ grue-5:
   operating_system:
     cstate_driver: acpi_idle
     cstate_governor: menu
-    ht_enabled: false
+    ht_enabled: true
     pstate_driver: acpi-cpufreq
     pstate_governor: performance
     turboboost_enabled: true