diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05bec8a9dc2c196df83d5703741e58acb8b6e2a4..c4151d5a67315105818b05aa45028862aece863f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
   - lint
   - check
   - generate-access-history
-  - deploy
+  - resources-explorer
 
 include:
   - project: 'grid5000/grid5000-gitlab-templates'
@@ -53,10 +53,8 @@ wikigen:
         DEBIAN_VERSION: [bookworm]
   script:
     - echo "$GRID5000_API" > "${HOME}/.grid5000_api.yml"
-    - bundle exec rake gen:wiki NAME=${GENERATOR} SITE=${SITE} DO=diff
-  only:
-    refs:
-      - master
+    - if [ "$CI_COMMIT_BRANCH" = "master" ]; then export WIKI="update"; else export WIKI="diff"; fi
+    - bundle exec rake gen:wiki NAME=${GENERATOR} SITE=${SITE} DO=${WIKI}
 
 check-no-changes-in-data:
   extends: .template-refrepo
@@ -88,7 +86,7 @@ deploy-to-api-servers:
     - /srv/ci-runner-scripts/bin/update-api-servers
 
 rebuild_resources_explorer:
-  stage: deploy
+  stage: resources-explorer
   # NOTE: this job triggers a rebuild of resources explorer which will be
   # automatically deployed to production if it succeeds, therefore it is only
   # ran on the main branch.
@@ -101,6 +99,29 @@ rebuild_resources_explorer:
     # as the pipeline is triggered, regardless of its status.
     strategy: depend
 
+preview_resources_explorer:
+  stage: resources-explorer
+  # NOTE: this job triggers a rebuild of resources explorer which will be
+  # automatically deployed to a specific environment.
+  # Resources Explorer build environments are available here:
+  # https://gitlab.inria.fr/grid5000/resources-explorer/-/environments
+  rules:
+    # Do not create the job on master
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      when: never
+    # But create a manual job on branches
+    - if: $CI_COMMIT_BRANCH
+      when: manual
+      allow_failure: true
+  variables:
+    NEXT_PUBLIC_REFREPO_BRANCH: $CI_COMMIT_BRANCH
+  trigger:
+    project: grid5000/resources-explorer
+    # This mirrors the status of RE's pipeline into our own.
+    # We may want to revisit this if we want to show a "green" job as soon
+    # as the pipeline is triggered, regardless of its status.
+    strategy: depend
+
 rspec:
   stage: check  # we use 'checks' here to avoid blocking on this when updating the ref-repo
   extends: .template-refrepo
diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 12c509a15e97d4a2d0643cf56b72095c6dac9d4f..6aa057f68eb88f6f3d5c402697ac5916dddafa24 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -37,12 +37,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -53,12 +47,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -94,12 +90,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -110,12 +100,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -130,7 +122,8 @@
     },
     "p1": {
       "ggas": [
-        "linkmedia"
+        "linkmedia",
+        "artishau"
       ],
       "sites": [
         "mc-staff-site",
@@ -176,12 +169,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -192,12 +179,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -233,12 +222,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -249,12 +232,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -308,12 +293,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -324,12 +303,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -381,12 +362,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -397,12 +372,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -438,12 +415,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -454,12 +425,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -497,12 +470,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -513,12 +480,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -533,7 +502,8 @@
     },
     "p1": {
       "ggas": [
-        "linkmedia"
+        "linkmedia",
+        "artishau"
       ],
       "sites": [
         "mc-staff-site",
@@ -556,12 +526,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -572,12 +536,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -638,12 +604,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -654,12 +614,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -695,12 +657,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -711,12 +667,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -754,12 +712,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -770,12 +722,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -790,7 +744,8 @@
     },
     "p1": {
       "ggas": [
-        "linkmedia"
+        "linkmedia",
+        "artishau"
       ],
       "sites": [
         "mc-staff-site",
@@ -813,12 +768,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -829,12 +778,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -872,12 +823,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -888,12 +833,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -948,12 +895,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -964,12 +905,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1005,12 +948,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1021,12 +958,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1041,7 +980,7 @@
     },
     "p1": {
       "ggas": [
-        "linkmedia"
+        "artishau"
       ],
       "sites": [
         "mc-staff-site",
@@ -1064,12 +1003,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1080,12 +1013,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1124,12 +1059,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1140,12 +1069,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1160,7 +1091,8 @@
     },
     "p1": {
       "ggas": [
-        "linkmedia"
+        "linkmedia",
+        "artishau"
       ],
       "sites": [
         "mc-staff-site",
@@ -1199,12 +1131,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1215,12 +1141,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1256,12 +1184,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1272,12 +1194,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1331,12 +1255,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1347,12 +1265,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1404,12 +1324,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1420,12 +1334,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1461,12 +1377,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1477,12 +1387,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
         "mc-bordeaux",
+        "mc-siege",
         "mc-guest",
         "slices-fr-grenoble",
         "slices-fr-lille",
@@ -1538,12 +1450,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1554,12 +1460,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1612,12 +1520,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1628,12 +1530,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1686,12 +1590,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1702,12 +1600,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1761,12 +1661,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1777,12 +1671,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1835,12 +1731,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1851,12 +1741,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1910,12 +1802,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1926,12 +1812,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -1977,12 +1865,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -1993,12 +1875,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2052,12 +1936,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2068,12 +1946,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2127,12 +2007,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2143,12 +2017,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2202,12 +2078,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2218,12 +2088,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2278,12 +2150,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2294,12 +2160,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2352,12 +2220,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2368,12 +2230,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2419,12 +2283,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2435,12 +2293,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2485,12 +2345,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2501,12 +2355,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2565,12 +2421,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2581,12 +2431,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2638,12 +2490,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2654,12 +2500,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2711,12 +2559,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2727,12 +2569,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2784,12 +2628,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2800,12 +2638,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2857,12 +2697,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2873,12 +2707,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -2937,12 +2773,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -2953,12 +2783,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3010,12 +2842,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3026,12 +2852,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3083,12 +2911,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3099,12 +2921,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3163,12 +2987,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3179,12 +2997,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3236,12 +3056,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3252,12 +3066,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3316,12 +3132,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3332,12 +3142,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3396,12 +3208,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3412,12 +3218,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
@@ -3469,12 +3277,6 @@
         "chroma",
         "emeraude",
         "maracas",
-        "hive",
-        "inriastartupstudio",
-        "sonaide",
-        "feelim",
-        "iss-idiscover",
-        "iss-manta",
         "inria-chile",
         "inria-dsi",
         "inria-sidf",
@@ -3485,12 +3287,14 @@
         "mc-rennes",
         "mc-nancy",
         "mc-lyon",
+        "mc-economic-activity",
         "mc-sophia",
         "mc-lille",
         "mc-grenoble",
         "mc-paris",
         "mc-saclay",
-        "mc-bordeaux"
+        "mc-bordeaux",
+        "mc-siege"
       ]
     },
     "p4": {
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
index 40ecbd2889b521c5e456c202efd8382031522553..6f2b525bc7c965677b7dd34758cf9bbf72b6b553 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
@@ -355,6 +355,8 @@
     }
   ],
   "model": "Dell PowerEdge C6420",
+  "nodes_count": 72,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6130, 16 cores/CPU, 192GB RAM, 223GB SSD, 447GB SSD, 3726GB HDD, 1 x 10Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": "201800",
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/clusters/drac/drac.json b/data/grid5000/sites/grenoble/clusters/drac/drac.json
index f2554a13133777de378d687913d2d1e88f0d625b..668f2793b3e76315f6800163913ee87182aeb31e 100644
--- a/data/grid5000/sites/grenoble/clusters/drac/drac.json
+++ b/data/grid5000/sites/grenoble/clusters/drac/drac.json
@@ -919,6 +919,8 @@
     }
   ],
   "model": "IBM PowerNV S822LC (8335-GTB)",
+  "nodes_count": 12,
+  "nodes_description": "2 CPUs POWER8NVL 1.0, 10 cores/CPU, 4 GPUs Tesla P100-SXM2-16GB, 128GB RAM, 2x931GB HDD, 1 x 10Gb Ethernet, 2 x 100Gb InfiniBand",
   "priority": 201710,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json b/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
index 3582f9f0124ee841e7b3105b18de47493da68238..d403c79524f1b4622c874a13bd161fc910f10287 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/kinovis.json
@@ -2,12 +2,85 @@
   "boot_type": "uefi",
   "created_at": "Mon, 10 Feb 2025 00:00:00 GMT",
   "exotic": false,
-  "kavlan": false,
+  "kavlan": true,
   "manufactured_at": "2024-06-26",
   "metrics": [
-
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "DCGM_FI_DEV_SM_CLOCK",
+          "DCGM_FI_DEV_MEM_CLOCK",
+          "DCGM_FI_DEV_GPU_TEMP",
+          "DCGM_FI_DEV_POWER_USAGE",
+          "DCGM_FI_DEV_MEM_COPY_UTIL"
+        ],
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    }
   ],
   "model": "HPE Proliant DL380 Gen11",
+  "nodes_count": 6,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6442Y, 24 cores/CPU, 2 GPUs L40S, 256GB RAM, 1787GB SSD, 2 x 25Gb Ethernet, 1 x 100Gb Ethernet",
   "priority": 202506,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
index 0dff65178e437b44b2da3e4b0b99bb54a5194746..adcca06a4615fb2703cc3f7978347e3f41c8fe9e 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-1.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.1",
+      "kavlan-11": "10.7.246.1",
+      "kavlan-12": "10.11.246.1",
+      "kavlan-13": "10.15.246.1",
+      "kavlan-14": "10.19.246.1",
+      "kavlan-16": "10.27.246.1",
+      "kavlan-17": "10.31.246.1",
+      "kavlan-18": "10.35.246.1",
+      "kavlan-2": "192.168.213.1",
+      "kavlan-20": "10.43.246.1",
+      "kavlan-21": "10.47.246.1",
+      "kavlan-3": "192.168.229.1",
+      "kavlan-4": "10.4.5.1",
+      "kavlan-5": "10.4.69.1",
+      "kavlan-6": "10.4.133.1",
+      "kavlan-7": "10.4.197.1",
+      "kavlan-8": "10.5.5.1",
+      "kavlan-9": "10.5.69.1"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.11",
+      "kavlan-11": "10.7.246.11",
+      "kavlan-12": "10.11.246.11",
+      "kavlan-13": "10.15.246.11",
+      "kavlan-14": "10.19.246.11",
+      "kavlan-16": "10.27.246.11",
+      "kavlan-17": "10.31.246.11",
+      "kavlan-18": "10.35.246.11",
+      "kavlan-2": "192.168.213.11",
+      "kavlan-20": "10.43.246.11",
+      "kavlan-21": "10.47.246.11",
+      "kavlan-3": "192.168.229.11",
+      "kavlan-4": "10.4.5.11",
+      "kavlan-5": "10.4.69.11",
+      "kavlan-6": "10.4.133.11",
+      "kavlan-7": "10.4.197.11",
+      "kavlan-8": "10.5.5.11",
+      "kavlan-9": "10.5.69.11"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.21",
+      "kavlan-11": "10.7.246.21",
+      "kavlan-12": "10.11.246.21",
+      "kavlan-13": "10.15.246.21",
+      "kavlan-14": "10.19.246.21",
+      "kavlan-16": "10.27.246.21",
+      "kavlan-17": "10.31.246.21",
+      "kavlan-18": "10.35.246.21",
+      "kavlan-2": "192.168.213.21",
+      "kavlan-20": "10.43.246.21",
+      "kavlan-21": "10.47.246.21",
+      "kavlan-3": "192.168.229.21",
+      "kavlan-4": "10.4.5.21",
+      "kavlan-5": "10.4.69.21",
+      "kavlan-6": "10.4.133.21",
+      "kavlan-7": "10.4.197.21",
+      "kavlan-8": "10.5.5.21",
+      "kavlan-9": "10.5.69.21"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::1",
+      "kavlan-11": "2001:660:4406:1a0:10d::1",
+      "kavlan-12": "2001:660:4406:2a0:10d::1",
+      "kavlan-13": "2001:660:4406:4a0:10d::1",
+      "kavlan-14": "2001:660:4406:5a0:10d::1",
+      "kavlan-16": "2001:660:4406:7a0:10d::1",
+      "kavlan-17": "2001:660:4406:9a0:10d::1",
+      "kavlan-18": "2001:660:4406:8a0:10d::1",
+      "kavlan-2": "2001:660:4406:181:d::1",
+      "kavlan-20": "2001:660:4406:3a0:10d::1",
+      "kavlan-21": "2001:660:4406:6a0:10d::1",
+      "kavlan-3": "2001:660:4406:182:d::1",
+      "kavlan-4": "2001:660:4406:190:d::1",
+      "kavlan-5": "2001:660:4406:191:d::1",
+      "kavlan-6": "2001:660:4406:192:d::1",
+      "kavlan-7": "2001:660:4406:193:d::1",
+      "kavlan-8": "2001:660:4406:194:d::1",
+      "kavlan-9": "2001:660:4406:195:d::1"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:1",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:1",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:1",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:1",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:1",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:1",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:1",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:1",
+      "kavlan-2": "2001:660:4406:181:d:1:0:1",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:1",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:1",
+      "kavlan-3": "2001:660:4406:182:d:1:0:1",
+      "kavlan-4": "2001:660:4406:190:d:1:0:1",
+      "kavlan-5": "2001:660:4406:191:d:1:0:1",
+      "kavlan-6": "2001:660:4406:192:d:1:0:1",
+      "kavlan-7": "2001:660:4406:193:d:1:0:1",
+      "kavlan-8": "2001:660:4406:194:d:1:0:1",
+      "kavlan-9": "2001:660:4406:195:d:1:0:1"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:1",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:1",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:1",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:1",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:1",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:1",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:1",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:1",
+      "kavlan-2": "2001:660:4406:181:d:2:0:1",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:1",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:1",
+      "kavlan-3": "2001:660:4406:182:d:2:0:1",
+      "kavlan-4": "2001:660:4406:190:d:2:0:1",
+      "kavlan-5": "2001:660:4406:191:d:2:0:1",
+      "kavlan-6": "2001:660:4406:192:d:2:0:1",
+      "kavlan-7": "2001:660:4406:193:d:2:0:1",
+      "kavlan-8": "2001:660:4406:194:d:2:0:1",
+      "kavlan-9": "2001:660:4406:195:d:2:0:1"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.1",
       "ip6": "2001:660:4406:100:d::1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ff:88",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.7",
       "ip6": "2001:660:4406:100:d:1:0:1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ff:89",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.13",
       "ip6": "2001:660:4406:100:d:2:0:1",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:1a:dc",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
index be0f7797108fd499c61ee9c5f9407c6080aa3a16..fe87a691e4666fa7e852f7333019f5eed3bd960c 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-2.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.2",
+      "kavlan-11": "10.7.246.2",
+      "kavlan-12": "10.11.246.2",
+      "kavlan-13": "10.15.246.2",
+      "kavlan-14": "10.19.246.2",
+      "kavlan-16": "10.27.246.2",
+      "kavlan-17": "10.31.246.2",
+      "kavlan-18": "10.35.246.2",
+      "kavlan-2": "192.168.213.2",
+      "kavlan-20": "10.43.246.2",
+      "kavlan-21": "10.47.246.2",
+      "kavlan-3": "192.168.229.2",
+      "kavlan-4": "10.4.5.2",
+      "kavlan-5": "10.4.69.2",
+      "kavlan-6": "10.4.133.2",
+      "kavlan-7": "10.4.197.2",
+      "kavlan-8": "10.5.5.2",
+      "kavlan-9": "10.5.69.2"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.12",
+      "kavlan-11": "10.7.246.12",
+      "kavlan-12": "10.11.246.12",
+      "kavlan-13": "10.15.246.12",
+      "kavlan-14": "10.19.246.12",
+      "kavlan-16": "10.27.246.12",
+      "kavlan-17": "10.31.246.12",
+      "kavlan-18": "10.35.246.12",
+      "kavlan-2": "192.168.213.12",
+      "kavlan-20": "10.43.246.12",
+      "kavlan-21": "10.47.246.12",
+      "kavlan-3": "192.168.229.12",
+      "kavlan-4": "10.4.5.12",
+      "kavlan-5": "10.4.69.12",
+      "kavlan-6": "10.4.133.12",
+      "kavlan-7": "10.4.197.12",
+      "kavlan-8": "10.5.5.12",
+      "kavlan-9": "10.5.69.12"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.22",
+      "kavlan-11": "10.7.246.22",
+      "kavlan-12": "10.11.246.22",
+      "kavlan-13": "10.15.246.22",
+      "kavlan-14": "10.19.246.22",
+      "kavlan-16": "10.27.246.22",
+      "kavlan-17": "10.31.246.22",
+      "kavlan-18": "10.35.246.22",
+      "kavlan-2": "192.168.213.22",
+      "kavlan-20": "10.43.246.22",
+      "kavlan-21": "10.47.246.22",
+      "kavlan-3": "192.168.229.22",
+      "kavlan-4": "10.4.5.22",
+      "kavlan-5": "10.4.69.22",
+      "kavlan-6": "10.4.133.22",
+      "kavlan-7": "10.4.197.22",
+      "kavlan-8": "10.5.5.22",
+      "kavlan-9": "10.5.69.22"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::2",
+      "kavlan-11": "2001:660:4406:1a0:10d::2",
+      "kavlan-12": "2001:660:4406:2a0:10d::2",
+      "kavlan-13": "2001:660:4406:4a0:10d::2",
+      "kavlan-14": "2001:660:4406:5a0:10d::2",
+      "kavlan-16": "2001:660:4406:7a0:10d::2",
+      "kavlan-17": "2001:660:4406:9a0:10d::2",
+      "kavlan-18": "2001:660:4406:8a0:10d::2",
+      "kavlan-2": "2001:660:4406:181:d::2",
+      "kavlan-20": "2001:660:4406:3a0:10d::2",
+      "kavlan-21": "2001:660:4406:6a0:10d::2",
+      "kavlan-3": "2001:660:4406:182:d::2",
+      "kavlan-4": "2001:660:4406:190:d::2",
+      "kavlan-5": "2001:660:4406:191:d::2",
+      "kavlan-6": "2001:660:4406:192:d::2",
+      "kavlan-7": "2001:660:4406:193:d::2",
+      "kavlan-8": "2001:660:4406:194:d::2",
+      "kavlan-9": "2001:660:4406:195:d::2"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:2",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:2",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:2",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:2",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:2",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:2",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:2",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:2",
+      "kavlan-2": "2001:660:4406:181:d:1:0:2",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:2",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:2",
+      "kavlan-3": "2001:660:4406:182:d:1:0:2",
+      "kavlan-4": "2001:660:4406:190:d:1:0:2",
+      "kavlan-5": "2001:660:4406:191:d:1:0:2",
+      "kavlan-6": "2001:660:4406:192:d:1:0:2",
+      "kavlan-7": "2001:660:4406:193:d:1:0:2",
+      "kavlan-8": "2001:660:4406:194:d:1:0:2",
+      "kavlan-9": "2001:660:4406:195:d:1:0:2"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:2",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:2",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:2",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:2",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:2",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:2",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:2",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:2",
+      "kavlan-2": "2001:660:4406:181:d:2:0:2",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:2",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:2",
+      "kavlan-3": "2001:660:4406:182:d:2:0:2",
+      "kavlan-4": "2001:660:4406:190:d:2:0:2",
+      "kavlan-5": "2001:660:4406:191:d:2:0:2",
+      "kavlan-6": "2001:660:4406:192:d:2:0:2",
+      "kavlan-7": "2001:660:4406:193:d:2:0:2",
+      "kavlan-8": "2001:660:4406:194:d:2:0:2",
+      "kavlan-9": "2001:660:4406:195:d:2:0:2"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.2",
       "ip6": "2001:660:4406:100:d::2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:90:ca",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.8",
       "ip6": "2001:660:4406:100:d:1:0:2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:90:cb",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.14",
       "ip6": "2001:660:4406:100:d:2:0:2",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:1a:d8",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
index 16410e124b38142bc5de151a53095ac262479830..333d5418ce22a53519aab07aec081e8fdbf36f9f 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-3.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.3",
+      "kavlan-11": "10.7.246.3",
+      "kavlan-12": "10.11.246.3",
+      "kavlan-13": "10.15.246.3",
+      "kavlan-14": "10.19.246.3",
+      "kavlan-16": "10.27.246.3",
+      "kavlan-17": "10.31.246.3",
+      "kavlan-18": "10.35.246.3",
+      "kavlan-2": "192.168.213.3",
+      "kavlan-20": "10.43.246.3",
+      "kavlan-21": "10.47.246.3",
+      "kavlan-3": "192.168.229.3",
+      "kavlan-4": "10.4.5.3",
+      "kavlan-5": "10.4.69.3",
+      "kavlan-6": "10.4.133.3",
+      "kavlan-7": "10.4.197.3",
+      "kavlan-8": "10.5.5.3",
+      "kavlan-9": "10.5.69.3"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.13",
+      "kavlan-11": "10.7.246.13",
+      "kavlan-12": "10.11.246.13",
+      "kavlan-13": "10.15.246.13",
+      "kavlan-14": "10.19.246.13",
+      "kavlan-16": "10.27.246.13",
+      "kavlan-17": "10.31.246.13",
+      "kavlan-18": "10.35.246.13",
+      "kavlan-2": "192.168.213.13",
+      "kavlan-20": "10.43.246.13",
+      "kavlan-21": "10.47.246.13",
+      "kavlan-3": "192.168.229.13",
+      "kavlan-4": "10.4.5.13",
+      "kavlan-5": "10.4.69.13",
+      "kavlan-6": "10.4.133.13",
+      "kavlan-7": "10.4.197.13",
+      "kavlan-8": "10.5.5.13",
+      "kavlan-9": "10.5.69.13"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.23",
+      "kavlan-11": "10.7.246.23",
+      "kavlan-12": "10.11.246.23",
+      "kavlan-13": "10.15.246.23",
+      "kavlan-14": "10.19.246.23",
+      "kavlan-16": "10.27.246.23",
+      "kavlan-17": "10.31.246.23",
+      "kavlan-18": "10.35.246.23",
+      "kavlan-2": "192.168.213.23",
+      "kavlan-20": "10.43.246.23",
+      "kavlan-21": "10.47.246.23",
+      "kavlan-3": "192.168.229.23",
+      "kavlan-4": "10.4.5.23",
+      "kavlan-5": "10.4.69.23",
+      "kavlan-6": "10.4.133.23",
+      "kavlan-7": "10.4.197.23",
+      "kavlan-8": "10.5.5.23",
+      "kavlan-9": "10.5.69.23"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::3",
+      "kavlan-11": "2001:660:4406:1a0:10d::3",
+      "kavlan-12": "2001:660:4406:2a0:10d::3",
+      "kavlan-13": "2001:660:4406:4a0:10d::3",
+      "kavlan-14": "2001:660:4406:5a0:10d::3",
+      "kavlan-16": "2001:660:4406:7a0:10d::3",
+      "kavlan-17": "2001:660:4406:9a0:10d::3",
+      "kavlan-18": "2001:660:4406:8a0:10d::3",
+      "kavlan-2": "2001:660:4406:181:d::3",
+      "kavlan-20": "2001:660:4406:3a0:10d::3",
+      "kavlan-21": "2001:660:4406:6a0:10d::3",
+      "kavlan-3": "2001:660:4406:182:d::3",
+      "kavlan-4": "2001:660:4406:190:d::3",
+      "kavlan-5": "2001:660:4406:191:d::3",
+      "kavlan-6": "2001:660:4406:192:d::3",
+      "kavlan-7": "2001:660:4406:193:d::3",
+      "kavlan-8": "2001:660:4406:194:d::3",
+      "kavlan-9": "2001:660:4406:195:d::3"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:3",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:3",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:3",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:3",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:3",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:3",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:3",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:3",
+      "kavlan-2": "2001:660:4406:181:d:1:0:3",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:3",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:3",
+      "kavlan-3": "2001:660:4406:182:d:1:0:3",
+      "kavlan-4": "2001:660:4406:190:d:1:0:3",
+      "kavlan-5": "2001:660:4406:191:d:1:0:3",
+      "kavlan-6": "2001:660:4406:192:d:1:0:3",
+      "kavlan-7": "2001:660:4406:193:d:1:0:3",
+      "kavlan-8": "2001:660:4406:194:d:1:0:3",
+      "kavlan-9": "2001:660:4406:195:d:1:0:3"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:3",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:3",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:3",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:3",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:3",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:3",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:3",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:3",
+      "kavlan-2": "2001:660:4406:181:d:2:0:3",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:3",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:3",
+      "kavlan-3": "2001:660:4406:182:d:2:0:3",
+      "kavlan-4": "2001:660:4406:190:d:2:0:3",
+      "kavlan-5": "2001:660:4406:191:d:2:0:3",
+      "kavlan-6": "2001:660:4406:192:d:2:0:3",
+      "kavlan-7": "2001:660:4406:193:d:2:0:3",
+      "kavlan-8": "2001:660:4406:194:d:2:0:3",
+      "kavlan-9": "2001:660:4406:195:d:2:0:3"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.3",
       "ip6": "2001:660:4406:100:d::3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ee:84",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.9",
       "ip6": "2001:660:4406:100:d:1:0:3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:ee:85",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.15",
       "ip6": "2001:660:4406:100:d:2:0:3",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:3a:98",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
index dd9590bd3bdaf40d6667742c5c3503941f93b44f..0d3d3e8dd8909a6760bddc5b1ad1d14b77c1fa7d 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-4.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.4",
+      "kavlan-11": "10.7.246.4",
+      "kavlan-12": "10.11.246.4",
+      "kavlan-13": "10.15.246.4",
+      "kavlan-14": "10.19.246.4",
+      "kavlan-16": "10.27.246.4",
+      "kavlan-17": "10.31.246.4",
+      "kavlan-18": "10.35.246.4",
+      "kavlan-2": "192.168.213.4",
+      "kavlan-20": "10.43.246.4",
+      "kavlan-21": "10.47.246.4",
+      "kavlan-3": "192.168.229.4",
+      "kavlan-4": "10.4.5.4",
+      "kavlan-5": "10.4.69.4",
+      "kavlan-6": "10.4.133.4",
+      "kavlan-7": "10.4.197.4",
+      "kavlan-8": "10.5.5.4",
+      "kavlan-9": "10.5.69.4"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.14",
+      "kavlan-11": "10.7.246.14",
+      "kavlan-12": "10.11.246.14",
+      "kavlan-13": "10.15.246.14",
+      "kavlan-14": "10.19.246.14",
+      "kavlan-16": "10.27.246.14",
+      "kavlan-17": "10.31.246.14",
+      "kavlan-18": "10.35.246.14",
+      "kavlan-2": "192.168.213.14",
+      "kavlan-20": "10.43.246.14",
+      "kavlan-21": "10.47.246.14",
+      "kavlan-3": "192.168.229.14",
+      "kavlan-4": "10.4.5.14",
+      "kavlan-5": "10.4.69.14",
+      "kavlan-6": "10.4.133.14",
+      "kavlan-7": "10.4.197.14",
+      "kavlan-8": "10.5.5.14",
+      "kavlan-9": "10.5.69.14"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.24",
+      "kavlan-11": "10.7.246.24",
+      "kavlan-12": "10.11.246.24",
+      "kavlan-13": "10.15.246.24",
+      "kavlan-14": "10.19.246.24",
+      "kavlan-16": "10.27.246.24",
+      "kavlan-17": "10.31.246.24",
+      "kavlan-18": "10.35.246.24",
+      "kavlan-2": "192.168.213.24",
+      "kavlan-20": "10.43.246.24",
+      "kavlan-21": "10.47.246.24",
+      "kavlan-3": "192.168.229.24",
+      "kavlan-4": "10.4.5.24",
+      "kavlan-5": "10.4.69.24",
+      "kavlan-6": "10.4.133.24",
+      "kavlan-7": "10.4.197.24",
+      "kavlan-8": "10.5.5.24",
+      "kavlan-9": "10.5.69.24"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::4",
+      "kavlan-11": "2001:660:4406:1a0:10d::4",
+      "kavlan-12": "2001:660:4406:2a0:10d::4",
+      "kavlan-13": "2001:660:4406:4a0:10d::4",
+      "kavlan-14": "2001:660:4406:5a0:10d::4",
+      "kavlan-16": "2001:660:4406:7a0:10d::4",
+      "kavlan-17": "2001:660:4406:9a0:10d::4",
+      "kavlan-18": "2001:660:4406:8a0:10d::4",
+      "kavlan-2": "2001:660:4406:181:d::4",
+      "kavlan-20": "2001:660:4406:3a0:10d::4",
+      "kavlan-21": "2001:660:4406:6a0:10d::4",
+      "kavlan-3": "2001:660:4406:182:d::4",
+      "kavlan-4": "2001:660:4406:190:d::4",
+      "kavlan-5": "2001:660:4406:191:d::4",
+      "kavlan-6": "2001:660:4406:192:d::4",
+      "kavlan-7": "2001:660:4406:193:d::4",
+      "kavlan-8": "2001:660:4406:194:d::4",
+      "kavlan-9": "2001:660:4406:195:d::4"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:4",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:4",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:4",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:4",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:4",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:4",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:4",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:4",
+      "kavlan-2": "2001:660:4406:181:d:1:0:4",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:4",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:4",
+      "kavlan-3": "2001:660:4406:182:d:1:0:4",
+      "kavlan-4": "2001:660:4406:190:d:1:0:4",
+      "kavlan-5": "2001:660:4406:191:d:1:0:4",
+      "kavlan-6": "2001:660:4406:192:d:1:0:4",
+      "kavlan-7": "2001:660:4406:193:d:1:0:4",
+      "kavlan-8": "2001:660:4406:194:d:1:0:4",
+      "kavlan-9": "2001:660:4406:195:d:1:0:4"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:4",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:4",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:4",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:4",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:4",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:4",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:4",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:4",
+      "kavlan-2": "2001:660:4406:181:d:2:0:4",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:4",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:4",
+      "kavlan-3": "2001:660:4406:182:d:2:0:4",
+      "kavlan-4": "2001:660:4406:190:d:2:0:4",
+      "kavlan-5": "2001:660:4406:191:d:2:0:4",
+      "kavlan-6": "2001:660:4406:192:d:2:0:4",
+      "kavlan-7": "2001:660:4406:193:d:2:0:4",
+      "kavlan-8": "2001:660:4406:194:d:2:0:4",
+      "kavlan-9": "2001:660:4406:195:d:2:0:4"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.4",
       "ip6": "2001:660:4406:100:d::4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:2d:80",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.10",
       "ip6": "2001:660:4406:100:d:1:0:4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:2d:81",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.16",
       "ip6": "2001:660:4406:100:d:2:0:4",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:1a:28",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
index 268e5e965b362b451c6fbf7377c90ba979481f9a..b9171bb5f4c972648f44fcbccc5f73585cc2e14c 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-5.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.5",
+      "kavlan-11": "10.7.246.5",
+      "kavlan-12": "10.11.246.5",
+      "kavlan-13": "10.15.246.5",
+      "kavlan-14": "10.19.246.5",
+      "kavlan-16": "10.27.246.5",
+      "kavlan-17": "10.31.246.5",
+      "kavlan-18": "10.35.246.5",
+      "kavlan-2": "192.168.213.5",
+      "kavlan-20": "10.43.246.5",
+      "kavlan-21": "10.47.246.5",
+      "kavlan-3": "192.168.229.5",
+      "kavlan-4": "10.4.5.5",
+      "kavlan-5": "10.4.69.5",
+      "kavlan-6": "10.4.133.5",
+      "kavlan-7": "10.4.197.5",
+      "kavlan-8": "10.5.5.5",
+      "kavlan-9": "10.5.69.5"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.15",
+      "kavlan-11": "10.7.246.15",
+      "kavlan-12": "10.11.246.15",
+      "kavlan-13": "10.15.246.15",
+      "kavlan-14": "10.19.246.15",
+      "kavlan-16": "10.27.246.15",
+      "kavlan-17": "10.31.246.15",
+      "kavlan-18": "10.35.246.15",
+      "kavlan-2": "192.168.213.15",
+      "kavlan-20": "10.43.246.15",
+      "kavlan-21": "10.47.246.15",
+      "kavlan-3": "192.168.229.15",
+      "kavlan-4": "10.4.5.15",
+      "kavlan-5": "10.4.69.15",
+      "kavlan-6": "10.4.133.15",
+      "kavlan-7": "10.4.197.15",
+      "kavlan-8": "10.5.5.15",
+      "kavlan-9": "10.5.69.15"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.25",
+      "kavlan-11": "10.7.246.25",
+      "kavlan-12": "10.11.246.25",
+      "kavlan-13": "10.15.246.25",
+      "kavlan-14": "10.19.246.25",
+      "kavlan-16": "10.27.246.25",
+      "kavlan-17": "10.31.246.25",
+      "kavlan-18": "10.35.246.25",
+      "kavlan-2": "192.168.213.25",
+      "kavlan-20": "10.43.246.25",
+      "kavlan-21": "10.47.246.25",
+      "kavlan-3": "192.168.229.25",
+      "kavlan-4": "10.4.5.25",
+      "kavlan-5": "10.4.69.25",
+      "kavlan-6": "10.4.133.25",
+      "kavlan-7": "10.4.197.25",
+      "kavlan-8": "10.5.5.25",
+      "kavlan-9": "10.5.69.25"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::5",
+      "kavlan-11": "2001:660:4406:1a0:10d::5",
+      "kavlan-12": "2001:660:4406:2a0:10d::5",
+      "kavlan-13": "2001:660:4406:4a0:10d::5",
+      "kavlan-14": "2001:660:4406:5a0:10d::5",
+      "kavlan-16": "2001:660:4406:7a0:10d::5",
+      "kavlan-17": "2001:660:4406:9a0:10d::5",
+      "kavlan-18": "2001:660:4406:8a0:10d::5",
+      "kavlan-2": "2001:660:4406:181:d::5",
+      "kavlan-20": "2001:660:4406:3a0:10d::5",
+      "kavlan-21": "2001:660:4406:6a0:10d::5",
+      "kavlan-3": "2001:660:4406:182:d::5",
+      "kavlan-4": "2001:660:4406:190:d::5",
+      "kavlan-5": "2001:660:4406:191:d::5",
+      "kavlan-6": "2001:660:4406:192:d::5",
+      "kavlan-7": "2001:660:4406:193:d::5",
+      "kavlan-8": "2001:660:4406:194:d::5",
+      "kavlan-9": "2001:660:4406:195:d::5"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:5",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:5",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:5",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:5",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:5",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:5",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:5",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:5",
+      "kavlan-2": "2001:660:4406:181:d:1:0:5",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:5",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:5",
+      "kavlan-3": "2001:660:4406:182:d:1:0:5",
+      "kavlan-4": "2001:660:4406:190:d:1:0:5",
+      "kavlan-5": "2001:660:4406:191:d:1:0:5",
+      "kavlan-6": "2001:660:4406:192:d:1:0:5",
+      "kavlan-7": "2001:660:4406:193:d:1:0:5",
+      "kavlan-8": "2001:660:4406:194:d:1:0:5",
+      "kavlan-9": "2001:660:4406:195:d:1:0:5"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:5",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:5",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:5",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:5",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:5",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:5",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:5",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:5",
+      "kavlan-2": "2001:660:4406:181:d:2:0:5",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:5",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:5",
+      "kavlan-3": "2001:660:4406:182:d:2:0:5",
+      "kavlan-4": "2001:660:4406:190:d:2:0:5",
+      "kavlan-5": "2001:660:4406:191:d:2:0:5",
+      "kavlan-6": "2001:660:4406:192:d:2:0:5",
+      "kavlan-7": "2001:660:4406:193:d:2:0:5",
+      "kavlan-8": "2001:660:4406:194:d:2:0:5",
+      "kavlan-9": "2001:660:4406:195:d:2:0:5"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.5",
       "ip6": "2001:660:4406:100:d::5",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:91:d8",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.11",
       "ip6": "2001:660:4406:100:d:1:0:5",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:43:91:d9",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.17",
       "ip6": "2001:660:4406:100:d:2:0:5",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:3a:f0",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
index a27bb6c14ad4e9ab9c5f8564b18a67b8584b699d..0d359283de60dce1d16e1fb640a154a056d35c81 100644
--- a/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/kinovis/nodes/kinovis-6.json
@@ -56,6 +56,130 @@
       "vendor": "Nvidia"
     }
   },
+  "kavlan": {
+    "eth0": {
+      "kavlan-1": "192.168.197.6",
+      "kavlan-11": "10.7.246.6",
+      "kavlan-12": "10.11.246.6",
+      "kavlan-13": "10.15.246.6",
+      "kavlan-14": "10.19.246.6",
+      "kavlan-16": "10.27.246.6",
+      "kavlan-17": "10.31.246.6",
+      "kavlan-18": "10.35.246.6",
+      "kavlan-2": "192.168.213.6",
+      "kavlan-20": "10.43.246.6",
+      "kavlan-21": "10.47.246.6",
+      "kavlan-3": "192.168.229.6",
+      "kavlan-4": "10.4.5.6",
+      "kavlan-5": "10.4.69.6",
+      "kavlan-6": "10.4.133.6",
+      "kavlan-7": "10.4.197.6",
+      "kavlan-8": "10.5.5.6",
+      "kavlan-9": "10.5.69.6"
+    },
+    "eth1": {
+      "kavlan-1": "192.168.197.16",
+      "kavlan-11": "10.7.246.16",
+      "kavlan-12": "10.11.246.16",
+      "kavlan-13": "10.15.246.16",
+      "kavlan-14": "10.19.246.16",
+      "kavlan-16": "10.27.246.16",
+      "kavlan-17": "10.31.246.16",
+      "kavlan-18": "10.35.246.16",
+      "kavlan-2": "192.168.213.16",
+      "kavlan-20": "10.43.246.16",
+      "kavlan-21": "10.47.246.16",
+      "kavlan-3": "192.168.229.16",
+      "kavlan-4": "10.4.5.16",
+      "kavlan-5": "10.4.69.16",
+      "kavlan-6": "10.4.133.16",
+      "kavlan-7": "10.4.197.16",
+      "kavlan-8": "10.5.5.16",
+      "kavlan-9": "10.5.69.16"
+    },
+    "eth2": {
+      "kavlan-1": "192.168.197.26",
+      "kavlan-11": "10.7.246.26",
+      "kavlan-12": "10.11.246.26",
+      "kavlan-13": "10.15.246.26",
+      "kavlan-14": "10.19.246.26",
+      "kavlan-16": "10.27.246.26",
+      "kavlan-17": "10.31.246.26",
+      "kavlan-18": "10.35.246.26",
+      "kavlan-2": "192.168.213.26",
+      "kavlan-20": "10.43.246.26",
+      "kavlan-21": "10.47.246.26",
+      "kavlan-3": "192.168.229.26",
+      "kavlan-4": "10.4.5.26",
+      "kavlan-5": "10.4.69.26",
+      "kavlan-6": "10.4.133.26",
+      "kavlan-7": "10.4.197.26",
+      "kavlan-8": "10.5.5.26",
+      "kavlan-9": "10.5.69.26"
+    }
+  },
+  "kavlan6": {
+    "eth0": {
+      "kavlan-1": "2001:660:4406:180:d::6",
+      "kavlan-11": "2001:660:4406:1a0:10d::6",
+      "kavlan-12": "2001:660:4406:2a0:10d::6",
+      "kavlan-13": "2001:660:4406:4a0:10d::6",
+      "kavlan-14": "2001:660:4406:5a0:10d::6",
+      "kavlan-16": "2001:660:4406:7a0:10d::6",
+      "kavlan-17": "2001:660:4406:9a0:10d::6",
+      "kavlan-18": "2001:660:4406:8a0:10d::6",
+      "kavlan-2": "2001:660:4406:181:d::6",
+      "kavlan-20": "2001:660:4406:3a0:10d::6",
+      "kavlan-21": "2001:660:4406:6a0:10d::6",
+      "kavlan-3": "2001:660:4406:182:d::6",
+      "kavlan-4": "2001:660:4406:190:d::6",
+      "kavlan-5": "2001:660:4406:191:d::6",
+      "kavlan-6": "2001:660:4406:192:d::6",
+      "kavlan-7": "2001:660:4406:193:d::6",
+      "kavlan-8": "2001:660:4406:194:d::6",
+      "kavlan-9": "2001:660:4406:195:d::6"
+    },
+    "eth1": {
+      "kavlan-1": "2001:660:4406:180:d:1:0:6",
+      "kavlan-11": "2001:660:4406:1a0:10d:1:0:6",
+      "kavlan-12": "2001:660:4406:2a0:10d:1:0:6",
+      "kavlan-13": "2001:660:4406:4a0:10d:1:0:6",
+      "kavlan-14": "2001:660:4406:5a0:10d:1:0:6",
+      "kavlan-16": "2001:660:4406:7a0:10d:1:0:6",
+      "kavlan-17": "2001:660:4406:9a0:10d:1:0:6",
+      "kavlan-18": "2001:660:4406:8a0:10d:1:0:6",
+      "kavlan-2": "2001:660:4406:181:d:1:0:6",
+      "kavlan-20": "2001:660:4406:3a0:10d:1:0:6",
+      "kavlan-21": "2001:660:4406:6a0:10d:1:0:6",
+      "kavlan-3": "2001:660:4406:182:d:1:0:6",
+      "kavlan-4": "2001:660:4406:190:d:1:0:6",
+      "kavlan-5": "2001:660:4406:191:d:1:0:6",
+      "kavlan-6": "2001:660:4406:192:d:1:0:6",
+      "kavlan-7": "2001:660:4406:193:d:1:0:6",
+      "kavlan-8": "2001:660:4406:194:d:1:0:6",
+      "kavlan-9": "2001:660:4406:195:d:1:0:6"
+    },
+    "eth2": {
+      "kavlan-1": "2001:660:4406:180:d:2:0:6",
+      "kavlan-11": "2001:660:4406:1a0:10d:2:0:6",
+      "kavlan-12": "2001:660:4406:2a0:10d:2:0:6",
+      "kavlan-13": "2001:660:4406:4a0:10d:2:0:6",
+      "kavlan-14": "2001:660:4406:5a0:10d:2:0:6",
+      "kavlan-16": "2001:660:4406:7a0:10d:2:0:6",
+      "kavlan-17": "2001:660:4406:9a0:10d:2:0:6",
+      "kavlan-18": "2001:660:4406:8a0:10d:2:0:6",
+      "kavlan-2": "2001:660:4406:181:d:2:0:6",
+      "kavlan-20": "2001:660:4406:3a0:10d:2:0:6",
+      "kavlan-21": "2001:660:4406:6a0:10d:2:0:6",
+      "kavlan-3": "2001:660:4406:182:d:2:0:6",
+      "kavlan-4": "2001:660:4406:190:d:2:0:6",
+      "kavlan-5": "2001:660:4406:191:d:2:0:6",
+      "kavlan-6": "2001:660:4406:192:d:2:0:6",
+      "kavlan-7": "2001:660:4406:193:d:2:0:6",
+      "kavlan-8": "2001:660:4406:194:d:2:0:6",
+      "kavlan-9": "2001:660:4406:195:d:2:0:6"
+    }
+  },
   "main_memory": {
     "ram_size": 274877906944
   },
@@ -116,7 +240,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.6",
       "ip6": "2001:660:4406:100:d::6",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:25:10",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -139,7 +263,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.12",
       "ip6": "2001:660:4406:100:d:1:0:6",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "d4:04:e6:42:25:11",
       "management": false,
       "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
@@ -162,7 +286,7 @@
       "interface": "Ethernet",
       "ip": "172.16.28.18",
       "ip6": "2001:660:4406:100:d:2:0:6",
-      "kavlan": false,
+      "kavlan": true,
       "mac": "88:e9:a4:ac:3a:8c",
       "management": false,
       "model": "MT28908 Family [ConnectX-6]",
diff --git a/data/grid5000/sites/grenoble/clusters/nessie/nessie.json b/data/grid5000/sites/grenoble/clusters/nessie/nessie.json
index 473bec418756c86f2b2eea617fd6db1b9b481dc7..0bd07b7d4620eaaeb1bac52a87d8ead7405af407 100644
--- a/data/grid5000/sites/grenoble/clusters/nessie/nessie.json
+++ b/data/grid5000/sites/grenoble/clusters/nessie/nessie.json
@@ -8,6 +8,8 @@
 
   ],
   "model": "HPE ProLiant DL385 Gen10+ v2",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6430, 32 cores/CPU, 64GB RAM, 1788GB SSD, 447GB SSD, 1 x 25Gb Ethernet",
   "priority": 202408,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/clusters/servan/servan.json b/data/grid5000/sites/grenoble/clusters/servan/servan.json
index 4d58cb493f681a5d51986fe12d976f10df687873..f39dc148d376297b4ea2250154c32017d4e83300 100644
--- a/data/grid5000/sites/grenoble/clusters/servan/servan.json
+++ b/data/grid5000/sites/grenoble/clusters/servan/servan.json
@@ -525,6 +525,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 2,
+  "nodes_description": "2 CPUs AMD EPYC 7352, 24 cores/CPU, 128GB RAM, 2x1490GB SSD, 1 x 25Gb Ethernet, 2 x 100Gb FPGA/Ethernet",
   "priority": 202112,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/clusters/troll/troll.json b/data/grid5000/sites/grenoble/clusters/troll/troll.json
index ae4d02ae8fc3ffe29d009a12ed3d0ea851425ded..98f66806953c9258eae4df54bbcd28c596a4192f 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/troll.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/troll.json
@@ -452,6 +452,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5218, 16 cores/CPU, 384GB RAM, 1536GB PMEM, 447GB SSD, 1490GB SSD, 1 x 25Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": 201911,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
index b20bea9a41040240b58c7024388561319108b904..7e9a0d3871828246f8c1577f2bb2790f80467244 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
@@ -403,6 +403,8 @@
     }
   ],
   "model": "Dell PowerEdge R940",
+  "nodes_count": 4,
+  "nodes_description": "4 CPUs Intel Xeon Gold 6130, 16 cores/CPU, 768GB RAM, 447GB SSD, 2x1490GB SSD, 3x1863GB HDD, 1 x 10Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": 201712,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
index 94d16164e4cb10109610693ab1b1cf6fae26e073..70ef62c313503035d20cfbb8b657e86c756b2f75 100644
--- a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
@@ -15,7 +15,7 @@
     },
     {
       "backplane_bps": 400000000000,
-      "kavlan_pattern": "%LINECARD%/%PORT%",
+      "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
       "kind": "node",
       "ports": [
         {
diff --git a/data/grid5000/sites/grenoble/servers/dighyp1.json b/data/grid5000/sites/grenoble/servers/dighyp1.json
index 38c7bca6f16fdd68a816f8a778d5c072f9955dea..4b9ff9a93863905caaf4283480f7dbb23f753694 100644
--- a/data/grid5000/sites/grenoble/servers/dighyp1.json
+++ b/data/grid5000/sites/grenoble/servers/dighyp1.json
@@ -1,7 +1,6 @@
 {
   "alias": [
-    "adminfront",
-    "af"
+
   ],
   "kind": "physical",
   "network_adapters": {
diff --git a/data/grid5000/sites/grenoble/servers/dignfs.json b/data/grid5000/sites/grenoble/servers/dignfs.json
index c37e60b6d0936cbe712c64fe6012eba11f1b225f..e09e9f595368f8b9134e0f676ce96de72a0f7c49 100644
--- a/data/grid5000/sites/grenoble/servers/dignfs.json
+++ b/data/grid5000/sites/grenoble/servers/dignfs.json
@@ -1,12 +1,7 @@
 {
   "alias": [
-
+    "storage1-old"
   ],
-  "group_storage": {
-    "name": "storage1",
-    "rate": 50000000000,
-    "size": 55000000000000
-  },
   "kind": "physical",
   "network_adapters": {
     "adm": {
diff --git a/data/grid5000/sites/grenoble/servers/pve-1.json b/data/grid5000/sites/grenoble/servers/pve-1.json
index 8cc9fb6a71a300075dc5f1b131a80122adeb3c1f..6c6fb5210f4eafc4ca4a80fa5b8e226f7d1c137b 100644
--- a/data/grid5000/sites/grenoble/servers/pve-1.json
+++ b/data/grid5000/sites/grenoble/servers/pve-1.json
@@ -1,6 +1,7 @@
 {
   "alias": [
-    "ntp"
+    "ntp",
+    "adminfront"
   ],
   "kind": "physical",
   "network_adapters": {
diff --git a/data/grid5000/sites/grenoble/servers/srv-data.json b/data/grid5000/sites/grenoble/servers/srv-data.json
index 62aef659dd0da281ccbf54604172016ab3508b74..8408728369c402285366f0e857f6ae0592ac0178 100644
--- a/data/grid5000/sites/grenoble/servers/srv-data.json
+++ b/data/grid5000/sites/grenoble/servers/srv-data.json
@@ -6,6 +6,11 @@
     "modules",
     "storage1"
   ],
+  "group_storage": {
+    "name": "storage1",
+    "rate": 25000000000,
+    "size": 162001569447936
+  },
   "kind": "physical",
   "network_adapters": {
     "adm": {
diff --git a/data/grid5000/sites/grenoble/servers/srv-data2.json b/data/grid5000/sites/grenoble/servers/srv-data2.json
index bc2a372a3d0c720ee2260717bca32272538ec99a..1f31630c8570afc084ac3a8a55e57024d8fbaf6d 100644
--- a/data/grid5000/sites/grenoble/servers/srv-data2.json
+++ b/data/grid5000/sites/grenoble/servers/srv-data2.json
@@ -2,6 +2,11 @@
   "alias": [
     "storage2"
   ],
+  "group_storage": {
+    "name": "storage2",
+    "rate": 25000000000,
+    "size": 162001569447936
+  },
   "kind": "physical",
   "network_adapters": {
     "adm": {
diff --git a/data/grid5000/sites/grenoble/servers/srv-data3.json b/data/grid5000/sites/grenoble/servers/srv-data3.json
index a3cf93ee0e9cc97c430da31d55df52bf4bfaedae..33219ccb7a702cde0bbd80f6e9aa1f05821a045b 100644
--- a/data/grid5000/sites/grenoble/servers/srv-data3.json
+++ b/data/grid5000/sites/grenoble/servers/srv-data3.json
@@ -2,6 +2,11 @@
   "alias": [
     "storage3"
   ],
+  "group_storage": {
+    "name": "storage3",
+    "rate": 100000000000,
+    "size": 360003477176320
+  },
   "kind": "physical",
   "network_adapters": {
     "adm": {
diff --git a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
index 3a8cc84d3af2b346b28d134e169e46597328a7db..feb61b3ed0387c2beb61c92b6f20be70e407c487 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
@@ -428,6 +428,8 @@
     }
   ],
   "model": "Dell PowerEdge R7425",
+  "nodes_count": 8,
+  "nodes_description": "2 CPUs AMD EPYC 7301, 16 cores/CPU, 128GB RAM, 447GB SSD, 2x3726GB HDD, 2 x 25Gb Ethernet",
   "priority": "201850",
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
index 3648385869c3ed99bb0c4ce729822cdd64e27a35..c0a0659558c02c86a04ac6a9e5a4cc425fd1bf96 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
@@ -547,6 +547,8 @@
     }
   ],
   "model": "Dell PowerEdge R740",
+  "nodes_count": 8,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6126, 12 cores/CPU, 2 GPUs Tesla P100-PCIE-16GB, 192GB RAM, 2x447GB SSD, 4x3726GB HDD, 2 x 25Gb Ethernet",
   "priority": "201870",
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lille/clusters/chirop/chirop.json b/data/grid5000/sites/lille/clusters/chirop/chirop.json
index cb21f3b8e8428b254f4ea1fbebdcbf0187d7639e..2a03bb2c59fc78e928c085ede7e68da8904c8952 100644
--- a/data/grid5000/sites/lille/clusters/chirop/chirop.json
+++ b/data/grid5000/sites/lille/clusters/chirop/chirop.json
@@ -757,6 +757,8 @@
     }
   ],
   "model": "DL360 Gen10+",
+  "nodes_count": 5,
+  "nodes_description": "2 CPUs Intel Xeon Platinum 8358, 32 cores/CPU, 512GB RAM, 1788GB SSD, 2x3576GB SSD, 2 x 25Gb Ethernet",
   "priority": 202305,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lille/clusters/chuc/chuc.json b/data/grid5000/sites/lille/clusters/chuc/chuc.json
index 789ba1c22cd931ee1bbf20e33bb3260aa98c6d24..9e7205b4a9e746276487ad4fda82c018d7035663 100644
--- a/data/grid5000/sites/lille/clusters/chuc/chuc.json
+++ b/data/grid5000/sites/lille/clusters/chuc/chuc.json
@@ -1571,6 +1571,8 @@
     }
   ],
   "model": "Apollo 6500 Gen10 Plus",
+  "nodes_count": 8,
+  "nodes_description": "1 CPU AMD EPYC 7513, 32 cores/CPU, 4 GPUs A100-SXM4-40GB, 512GB RAM, 4x1788GB SSD, 2 x 25Gb Ethernet",
   "priority": 202405,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index 79955ce2648fde1c1e5ad8165c54e08b5687ffc1..ece4656e493f40f29e8b99001dbc6995fa0ae814 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -18,6 +18,12 @@
       "port": "port-channel4",
       "rate": 20000000000,
       "uid": "granche-srv2"
+    },
+    "port-channel5": {
+      "kind": "server",
+      "port": "port-channel5",
+      "rate": 10000000000,
+      "uid": "pve-3"
     }
   },
   "ip": "172.17.47.222",
@@ -84,8 +90,14 @@
           "uid": "port-channel4"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/19",
+          "uid": "port-channel5"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/20",
+          "uid": "port-channel5"
         },
         {
           "kind": "server",
diff --git a/data/grid5000/sites/lille/servers/gardin.json b/data/grid5000/sites/lille/servers/pve-3.json
similarity index 70%
rename from data/grid5000/sites/lille/servers/gardin.json
rename to data/grid5000/sites/lille/servers/pve-3.json
index f3f18c49a9fc2716ebc2f309f1f60d4a9d3cf6cf..2fa8d3dd8209e1b95fad91e7c4e53a145d6e3c09 100644
--- a/data/grid5000/sites/lille/servers/gardin.json
+++ b/data/grid5000/sites/lille/servers/pve-3.json
@@ -1,9 +1,16 @@
 {
   "kind": "physical",
   "network_adapters": {
+    "adm": {
+      "ip": "172.17.47.9"
+    },
     "bmc": {
       "ip": "172.17.46.9",
       "mac": "54:48:10:f4:f9:0c"
+    },
+    "default": {
+      "ip": "172.16.47.9",
+      "mac": "24:6e:96:dc:f4:2c"
     }
   },
   "pdu": [
@@ -19,6 +26,6 @@
   "redfish": true,
   "serial": "2SYTKQ2",
   "type": "server",
-  "uid": "gardin",
+  "uid": "pve-3",
   "warranty": "2025-06-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.json
index adedd8dca0f343b79bcc5ce7aed96a5e9b84c33f..1c01c2899e5b271babf86f809cac8b300994a4a3 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.json
index 896b5c92fc8a8fd63a158327899f3abfc9b55fda..00450af561e89d3390269a1aa2804d824d3a884c 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.json
index f698f26af0ce2a7cfb18c235c097f4f7388210aa..1f416ce2350559b8018ebbc0c9e14d83a44ac645 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.json
index 36304776264e783a67b9da7f6a0ebca98a2393e6..8a29f1e70d55dd93515c4d6841a662a5b4496ba9 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.json
index f80e89a38c25a2da5b70b6ff3badc13a34de020a..ee1d7e401a894ee195130d7b0c3e3dd93e8e3408 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.json
index 9151a481fcc64b31e58e2bb85f6bf62325ed4c81..a37aa0ca27f596492f7f58e299a2e62cbccc4426 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.json
index 4cd0b0618a89648d54d8d43c5fed907165116c3b..3b3045aec8b09e67dc1029a4f0da09fda277bfa1 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.json b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.json
index c7021c37d6bc2c81bea0540b24690d1b24d132ef..1a09f3820ce03428d7327dee34906d22ff3bfe10 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.json
@@ -254,9 +254,9 @@
     "cstate_driver": "intel_idle",
     "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 108800000000,
diff --git a/data/grid5000/sites/louvain/clusters/spirou/spirou.json b/data/grid5000/sites/louvain/clusters/spirou/spirou.json
index 595cc87f04b626442d33bfba2f1a53aca97309a4..86647da74928aca17d7f0e0f706c1ba9eed53a92 100644
--- a/data/grid5000/sites/louvain/clusters/spirou/spirou.json
+++ b/data/grid5000/sites/louvain/clusters/spirou/spirou.json
@@ -8,6 +8,8 @@
 
   ],
   "model": "ThinkSystem SR630 V2",
+  "nodes_count": 8,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5318Y, 24 cores/CPU, 256GB RAM, 447GB SSD, 3726GB HDD, 1 x 100Gb Ethernet",
   "priority": 202401,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
index deffb5cb7430ae935af09b3529cb787386479a08..c123832a7ee10ad4011c62655872e87fbc63e842 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
@@ -330,6 +330,8 @@
     }
   ],
   "model": "Dell PowerEdge M620",
+  "nodes_count": 16,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630L, 6 cores/CPU, 32GB RAM, 232GB HDD, 2 x 10Gb Ethernet",
   "priority": 201210,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/gemini/gemini.json b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
index f6cf392173770f474cf473ad308c679df7163e5a..82b0258815bc1b1234a06b22273452a4fa671575 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/gemini.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
@@ -1092,6 +1092,8 @@
     }
   ],
   "model": "Nvidia DGX-1",
+  "nodes_count": 2,
+  "nodes_description": "2 CPUs Intel Xeon E5-2698 v4, 20 cores/CPU, 8 GPUs Tesla V100-SXM2-32GB, 512GB RAM, 447GB SSD, 4x1788GB SSD, 1 x 10Gb Ethernet",
   "priority": 202006,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/hercule/hercule.json b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
index afe8287cd30ccaec695f0174690ccc179efa5471..0c9328d77f8612f9bac15262977bae2c323e0c23 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/hercule.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
@@ -140,6 +140,8 @@
     }
   ],
   "model": "Dell PowerEdge C6220",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2620, 6 cores/CPU, 32GB RAM, 3x1863GB HDD, 1 x 10Gb Ethernet",
   "priority": "201299",
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/hydra/hydra.json b/data/grid5000/sites/lyon/clusters/hydra/hydra.json
index 21f842ce3422c0cd8471455fa9b5d1797208bb91..f03ae1a5cacc37451b1016796430eecb4428bb8f 100644
--- a/data/grid5000/sites/lyon/clusters/hydra/hydra.json
+++ b/data/grid5000/sites/lyon/clusters/hydra/hydra.json
@@ -221,6 +221,8 @@
     }
   ],
   "model": "NVIDIA Grace Hopper",
+  "nodes_count": 4,
+  "nodes_description": "1 CPU Grace A02  CPU Unknown, 72 cores/CPU, 480GB RAM, 894GB SSD, 1788GB SSD, 1 x 10Gb Ethernet",
   "priority": 202402,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lyon/clusters/neowise/neowise.json b/data/grid5000/sites/lyon/clusters/neowise/neowise.json
index a886bd9bcbbf0a6367e70ffd497c79e6a05cd9a3..aecc8f0b0c5ff684809e1f23d3243b13414ac3a5 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/neowise.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/neowise.json
@@ -1246,6 +1246,8 @@
     }
   ],
   "model": "AMD-Penguin Computing",
+  "nodes_count": 10,
+  "nodes_description": "1 CPU AMD EPYC 7642, 48 cores/CPU, 8 GPUs Radeon Instinct MI50 32GB, 512GB RAM, 1788GB SSD, 2 x 10Gb Ethernet, 2 x 100Gb InfiniBand",
   "priority": 202205,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index ef560f12d334d3a90f8b46ab61626f0664d57ec6..bb23ef335f765a180c6e701536b9feba9c7d2080 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -317,6 +317,8 @@
     }
   ],
   "model": "Dell PowerEdge R430",
+  "nodes_count": 23,
+  "nodes_description": "2 CPUs Intel Xeon E5-2620 v4, 8 cores/CPU, 64GB RAM, 557GB HDD, 1 x 10Gb Ethernet",
   "priority": "201700",
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index ac92818f546ffe8675c471d436e55ef4ff7be77e..c8467d3049244f3c31e6da5b5e2a76bed3e42456 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -322,6 +322,8 @@
     }
   ],
   "model": "Dell PowerEdge R720",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630, 6 cores/CPU, 1 GPU Tesla M2075, 32GB RAM, 278GB HDD, 1 x 10Gb Ethernet",
   "priority": "201299",
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
index 8ef5c3ee6f2d590b06891e6baad29ba8c4886ff6..c7802c7e074a2a915af198beb37c65a344ac1ce5 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
@@ -999,6 +999,8 @@
     }
   ],
   "model": "Gigabyte R181-T92-00",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs ThunderX2 99xx, 32 cores/CPU, 256GB RAM, 2x232GB SSD, 1 x 10Gb Ethernet",
   "priority": 201911,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
index 2b3632facbfc64acaff39fb93956662839b4fdd9..dc1c2a5b744af9fdf27479ab5ad08559c85d75db 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
@@ -148,6 +148,8 @@
     }
   ],
   "model": "Sun Fire V20z",
+  "nodes_count": 79,
+  "nodes_description": "2 CPUs AMD Opteron 250, 1 core/CPU, 2GB RAM, 68GB HDD, 1 x 1Gb Ethernet",
   "priority": "301899",
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/sirius/sirius.json b/data/grid5000/sites/lyon/clusters/sirius/sirius.json
index e13e9a0b0b66064e94e8583397c17a91e57d4ce6..c678b698529663fd92138c01dfe9d02b26d39622 100644
--- a/data/grid5000/sites/lyon/clusters/sirius/sirius.json
+++ b/data/grid5000/sites/lyon/clusters/sirius/sirius.json
@@ -1900,6 +1900,8 @@
     }
   ],
   "model": "NVidia DGX A100",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7742, 64 cores/CPU, 8 GPUs A100-SXM4-40GB, 1024GB RAM, 2x1788GB SSD, 4x3576GB SSD, 1 x 100Gb Ethernet",
   "priority": 202211,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index 8ab2157b3f77c0ec745052bbedd7ad363caec10b..b847f3a3fce178c1456ab81f7bd00aa9ad3d7eb7 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -322,6 +322,8 @@
     }
   ],
   "model": "Dell PowerEdge R720",
+  "nodes_count": 16,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630, 6 cores/CPU, 32GB RAM, 278GB HDD, 1 x 10Gb Ethernet",
   "priority": 201207,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
index ebdd661cc70c09a1b3a7cf17088ac4114ac6a1a9..d15b611375d3e7ed1bcad24ed798da55523646e0 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
@@ -382,6 +382,8 @@
     }
   ],
   "model": "Dell PowerEdge T640",
+  "nodes_count": 13,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4110, 8 cores/CPU, 4 GPUs GeForce RTX 2080 Ti, 128GB RAM, 446GB HDD, 1 x 10Gb Ethernet",
   "priority": 202005,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grappe/grappe.json b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
index dfca691a04856c0c46976eddeeeb9ada4cb4b0df..29ede9ee472bbf455ca0708430d932acef2c416e 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/grappe.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
@@ -470,6 +470,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 16,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5218R, 20 cores/CPU, 96GB RAM, 447GB SSD, 7452GB HDD, 1 x 25Gb Ethernet",
   "priority": 202007,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grat/grat.json b/data/grid5000/sites/nancy/clusters/grat/grat.json
index c25c1e0f89b9665b1f9e05508ccfd634459c5fbe..a476ba93a5deea7e9a3aea0226e184f1a8fcf427 100644
--- a/data/grid5000/sites/nancy/clusters/grat/grat.json
+++ b/data/grid5000/sites/nancy/clusters/grat/grat.json
@@ -2017,6 +2017,8 @@
     }
   ],
   "model": "HPE Apollo 6500",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7513, 32 cores/CPU, 8 GPUs A100-SXM4-40GB, 512GB RAM, 8x3576GB SSD, 1 x 25Gb Ethernet",
   "priority": 202306,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json b/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json
index 757d90ee93b02f9c2ee9ac8b85506f5eedf7828b..6f0d164166cc2c1fab3acea0209d2f36f9ffa6da 100644
--- a/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json
+++ b/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json
@@ -367,6 +367,8 @@
     }
   ],
   "model": "Dell PowerEdge R730",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 1 GPU Tesla V100-PCIE-16GB, 128GB RAM, 2x278GB HDD, 1 x 10Gb Ethernet",
   "priority": 201806,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grdix/grdix.json b/data/grid5000/sites/nancy/clusters/grdix/grdix.json
index 4956055a03d985cb3ceab79e027bdb10c28da1c6..9fa67c1f4a0ac2477457d95a4a068367d280b6bf 100644
--- a/data/grid5000/sites/nancy/clusters/grdix/grdix.json
+++ b/data/grid5000/sites/nancy/clusters/grdix/grdix.json
@@ -332,6 +332,8 @@
     }
   ],
   "model": "ProLiant DL365 Gen11",
+  "nodes_count": 16,
+  "nodes_description": "2 CPUs AMD EPYC 9754, 128 cores/CPU, 1024GB RAM, 1490GB SSD, 1 x 25Gb Ethernet, 1 x 200Gb InfiniBand",
   "priority": 202409,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grele/grele.json b/data/grid5000/sites/nancy/clusters/grele/grele.json
index 68441f2e693c059132a02d5a54cd9ae82fc4d834..3da17dfaa829a97fb00412b4eb8bfac3eeb62307 100644
--- a/data/grid5000/sites/nancy/clusters/grele/grele.json
+++ b/data/grid5000/sites/nancy/clusters/grele/grele.json
@@ -367,6 +367,8 @@
     }
   ],
   "model": "Dell PowerEdge R730",
+  "nodes_count": 14,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 2 GPUs GeForce GTX 1080 Ti, 128GB RAM, 2x278GB HDD, 1 x 10Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": 201806,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/gres/gres.json b/data/grid5000/sites/nancy/clusters/gres/gres.json
index 3c20b1145444ea9d010102868558178a5682b387..32e041c8aae78a5d486f2e675e3b64692416dceb 100644
--- a/data/grid5000/sites/nancy/clusters/gres/gres.json
+++ b/data/grid5000/sites/nancy/clusters/gres/gres.json
@@ -1201,6 +1201,8 @@
     }
   ],
   "model": "ProLiant DL385 Gen11",
+  "nodes_count": 7,
+  "nodes_description": "2 CPUs AMD EPYC 9254, 24 cores/CPU, 2 GPUs L40S, 512GB RAM, 5961GB SSD, 1 x 25Gb Ethernet",
   "priority": 202508,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/gros/gros.json b/data/grid5000/sites/nancy/clusters/gros/gros.json
index 5677c1dff04ff57460ad5e86b12f90f76c0ed8d4..88446b3d452edd38b77fc24aa221cf98babbefdd 100644
--- a/data/grid5000/sites/nancy/clusters/gros/gros.json
+++ b/data/grid5000/sites/nancy/clusters/gros/gros.json
@@ -494,6 +494,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 124,
+  "nodes_description": "1 CPU Intel Xeon Gold 5220, 18 cores/CPU, 96GB RAM, 447GB SSD, 894GB SSD, 2 x 25Gb Ethernet",
   "priority": 201907,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grosminet/grosminet.json b/data/grid5000/sites/nancy/clusters/grosminet/grosminet.json
index 8424d68ee755e207abf89bb7075e94627eb3696d..3ad46287f721a7411e615be11fbfbc33fad791f2 100644
--- a/data/grid5000/sites/nancy/clusters/grosminet/grosminet.json
+++ b/data/grid5000/sites/nancy/clusters/grosminet/grosminet.json
@@ -699,6 +699,8 @@
     }
   ],
   "model": "Proliant DL560 Gen10",
+  "nodes_count": 1,
+  "nodes_description": "4 CPUs Intel Xeon Gold 6240L, 18 cores/CPU, 6144GB RAM, 8x1490GB SSD, 1 x 25Gb Ethernet",
   "priority": 202311,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json b/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
index 888a213e561bf1d6fc8113755569fd60c3f61b09..29ab960240d00c99c592adf6e3423e14a9dbc0cf 100644
--- a/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
+++ b/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
@@ -407,6 +407,8 @@
     }
   ],
   "model": "Dell PowerEdge R930",
+  "nodes_count": 1,
+  "nodes_description": "4 CPUs Intel Xeon E7-4850 v3, 14 cores/CPU, 1536GB RAM, 1117GB HDD, 3724GB HDD, 558GB HDD, 1 x 10Gb Ethernet",
   "priority": 201510,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grouille/grouille.json b/data/grid5000/sites/nancy/clusters/grouille/grouille.json
index ed93f0fa3410e8bff6ba90e3c326694540cf604c..1561166e264ee287b8110151b43cc821c39eb77f 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/grouille.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/grouille.json
@@ -395,6 +395,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 2,
+  "nodes_description": "2 CPUs AMD EPYC 7452, 32 cores/CPU, 2 GPUs A100-PCIE-40GB, 128GB RAM, 1788GB SSD, 894GB SSD, 1 x 25Gb Ethernet",
   "priority": 202112,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grue/grue.json b/data/grid5000/sites/nancy/clusters/grue/grue.json
index 9914e75d2b232cd59ae2172e1b5918a52e1d200c..4eef69b2373f111a71822e3a59be8484f03f2000 100644
--- a/data/grid5000/sites/nancy/clusters/grue/grue.json
+++ b/data/grid5000/sites/nancy/clusters/grue/grue.json
@@ -423,6 +423,8 @@
     }
   ],
   "model": "Dell PowerEdge R7425",
+  "nodes_count": 5,
+  "nodes_description": "2 CPUs AMD EPYC 7351, 16 cores/CPU, 4 GPUs Tesla T4, 128GB RAM, 446GB HDD, 1 x 10Gb Ethernet",
   "priority": 202011,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/nancy/clusters/gruss/gruss.json b/data/grid5000/sites/nancy/clusters/gruss/gruss.json
index e986f1e861b276de8776e366e7027103fde9adcc..59fb1bc4f75a0c4cc9817c0f24c66c22508f40c8 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/gruss.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/gruss.json
@@ -395,6 +395,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs AMD EPYC 7352, 24 cores/CPU, 2 GPUs A40, 256GB RAM, 1788GB SSD, 1 x 25Gb Ethernet",
   "priority": 202206,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
index 000200ab1d63cb7bf7150e69a7ce7fc52322a9f2..5a5697aa15137b23c5a2ac7fd1240abd894a9285 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
@@ -355,6 +355,8 @@
     }
   ],
   "model": "Dell PowerEdge C6420",
+  "nodes_count": 64,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6130, 16 cores/CPU, 192GB RAM, 931GB HDD, 1 x 10Gb Ethernet, 1 x 100Gb Omni-Path",
   "priority": "201701",
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/nantes/clusters/econome/econome.json b/data/grid5000/sites/nantes/clusters/econome/econome.json
index dd13522b97d4c4cf6f2f15b018e07385e37d2a0a..b8e8af2d1c0b8687e135ca6e0c926e7fdfd4fd5d 100644
--- a/data/grid5000/sites/nantes/clusters/econome/econome.json
+++ b/data/grid5000/sites/nantes/clusters/econome/econome.json
@@ -357,6 +357,8 @@
     }
   ],
   "model": "Dell PowerEdge C6220",
+  "nodes_count": 22,
+  "nodes_description": "2 CPUs Intel Xeon E5-2660, 8 cores/CPU, 64GB RAM, 1863GB HDD, 1 x 10Gb Ethernet",
   "priority": 201206,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
index bfc06856d3984bfb406e6d8fadb725edc1488fc9..a290777fe6dd2b16992ddee3e0a3deca93a2c67b 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
@@ -916,6 +916,8 @@
     }
   ],
   "model": "Dell PowerEdge R630",
+  "nodes_count": 48,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630L v4, 10 cores/CPU, 128GB RAM, 372GB SSD, 1 x 10Gb Ethernet",
   "priority": 201707,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json b/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json
index b982cc4fde64bf9b4755759a55be3520c665c291..03ed4a2be37f86d8b1c105f5a601b188abbeab5f 100644
--- a/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R730",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 2 GPUs Tesla P100-PCIE-16GB, 128GB RAM, 278GB HDD, 1 x 1Gb Ethernet",
   "priority": 201707,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus10/abacus10.json b/data/grid5000/sites/rennes/clusters/abacus10/abacus10.json
index 1267b1346195cc1f59440c1751d23632313480e2..55a97a4d30ffb915380911d527b758c49be16352 100644
--- a/data/grid5000/sites/rennes/clusters/abacus10/abacus10.json
+++ b/data/grid5000/sites/rennes/clusters/abacus10/abacus10.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge T640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4114, 10 cores/CPU, 4 GPUs RTX A5000, 192GB RAM, 893GB HDD, 278GB HDD, 5587GB HDD, 1 x 1Gb Ethernet",
   "priority": 201912,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus11/abacus11.json b/data/grid5000/sites/rennes/clusters/abacus11/abacus11.json
index f1a3ada449f1e1513614362da8d2f7c4b233caac..0a3527b557e414be1dd4135b88ed6cef61f5ecc6 100644
--- a/data/grid5000/sites/rennes/clusters/abacus11/abacus11.json
+++ b/data/grid5000/sites/rennes/clusters/abacus11/abacus11.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge T640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4114, 10 cores/CPU, 2 GPUs RTX A5000, 192GB RAM, 278GB HDD, 893GB HDD, 7450GB HDD, 1 x 1Gb Ethernet",
   "priority": 201912,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus12/abacus12.json b/data/grid5000/sites/rennes/clusters/abacus12/abacus12.json
index f5050955ddb35028bf4470a92fbc3dd41933fd07..87fd40de09bde714a20315f5ba50018f8cabc37c 100644
--- a/data/grid5000/sites/rennes/clusters/abacus12/abacus12.json
+++ b/data/grid5000/sites/rennes/clusters/abacus12/abacus12.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R740",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6248, 20 cores/CPU, 3 GPUs Tesla V100-PCIE-32GB, 384GB RAM, 278GB HDD, 1 x 10Gb Ethernet",
   "priority": 202010,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus14/abacus14.json b/data/grid5000/sites/rennes/clusters/abacus14/abacus14.json
index c1efb3a359ac5fff0a6d1fcf5f21624382018f31..925c500a13088994efe9e73983e7dc3bc53842ae 100644
--- a/data/grid5000/sites/rennes/clusters/abacus14/abacus14.json
+++ b/data/grid5000/sites/rennes/clusters/abacus14/abacus14.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C4140",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4214, 12 cores/CPU, 4 GPUs Tesla V100-PCIE-32GB, 384GB RAM, 2x223GB SSD, 1 x 10Gb Ethernet",
   "priority": 202009,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json b/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json
index fc5e169528bd0453abdbf260f8c82500e3bce3d1..c0aac9f50e40be09c439927a90cb928f00e48413 100644
--- a/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json
+++ b/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json
@@ -409,6 +409,8 @@
     }
   ],
   "model": "Dell PowerEdge C4140",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4214, 12 cores/CPU, 4 GPUs Tesla V100-PCIE-32GB, 384GB RAM, 223GB HDD, 1 x 10Gb Ethernet",
   "priority": 202009,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus17/abacus17.json b/data/grid5000/sites/rennes/clusters/abacus17/abacus17.json
index 0aeaa0b5449f58a836db391bc5d18e4f08320aad..3db929663102c966906876531f7d3bf3bd6718d3 100644
--- a/data/grid5000/sites/rennes/clusters/abacus17/abacus17.json
+++ b/data/grid5000/sites/rennes/clusters/abacus17/abacus17.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7282, 16 cores/CPU, 2 GPUs Quadro RTX 6000, 256GB RAM, 223GB SSD, 894GB SSD, 1 x 1Gb Ethernet",
   "priority": 202111,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json b/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json
index 6c3211dd72dbf97f50db9dd0a454682a0081ccdd..515c8b06821214179707e496bf4daf50f6768861 100644
--- a/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json
+++ b/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7352, 24 cores/CPU, 3 GPUs Quadro RTX 6000, 256GB RAM, 223GB SSD, 894GB SSD, 1 x 1Gb Ethernet",
   "priority": 202111,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus19/abacus19.json b/data/grid5000/sites/rennes/clusters/abacus19/abacus19.json
index f94e91d7ebf771869081afab31249a3e556ea0ca..31ffcde813f71b465ce88c99f3626f9c65335a76 100644
--- a/data/grid5000/sites/rennes/clusters/abacus19/abacus19.json
+++ b/data/grid5000/sites/rennes/clusters/abacus19/abacus19.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R740",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5220R, 24 cores/CPU, 2 GPUs Quadro RTX 8000, 384GB RAM, 894GB SSD, 223GB SSD, 1 x 1Gb Ethernet",
   "priority": 202111,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus2/abacus2.json b/data/grid5000/sites/rennes/clusters/abacus2/abacus2.json
index ad2b2da21ab319028b75df9079efdff341262289..321f3a22d67c6b15542cd6f9b1f127a109ca74e4 100644
--- a/data/grid5000/sites/rennes/clusters/abacus2/abacus2.json
+++ b/data/grid5000/sites/rennes/clusters/abacus2/abacus2.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R730",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon E5-2609 v4, 8 cores/CPU, 2 GPUs Tesla P100-PCIE-16GB, 64GB RAM, 278GB HDD, 1 x 1Gb Ethernet",
   "priority": 201808,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus20/abacus20.json b/data/grid5000/sites/rennes/clusters/abacus20/abacus20.json
index 9b7b1beba1961c99f8eda7d0e2e66fbcdc351285..bbd5cb7930298aa4b6a07f04041a246dfc73baf6 100644
--- a/data/grid5000/sites/rennes/clusters/abacus20/abacus20.json
+++ b/data/grid5000/sites/rennes/clusters/abacus20/abacus20.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge T640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5220R, 24 cores/CPU, 4 GPUs Quadro RTX 8000, 768GB RAM, 447GB SSD, 1788GB SSD, 1 x 1Gb Ethernet",
   "priority": 202112,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus21/abacus21.json b/data/grid5000/sites/rennes/clusters/abacus21/abacus21.json
index c85b60bff4e9a0cd5776cf7c2a7653abc44dd956..7c8512854146f144791e0c549e66398957eed064 100644
--- a/data/grid5000/sites/rennes/clusters/abacus21/abacus21.json
+++ b/data/grid5000/sites/rennes/clusters/abacus21/abacus21.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7F72, 24 cores/CPU, 3 GPUs A100-PCIE-40GB, 512GB RAM, 3576GB SSD, 2x446GB SSD, 1 x 1Gb Ethernet",
   "priority": 202208,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus22/abacus22.json b/data/grid5000/sites/rennes/clusters/abacus22/abacus22.json
index dacb0861ed68aa3f587e816367045120d323a1f2..22d1463b4f4026a1bd74ff0899c17b0156778e68 100644
--- a/data/grid5000/sites/rennes/clusters/abacus22/abacus22.json
+++ b/data/grid5000/sites/rennes/clusters/abacus22/abacus22.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "ProLiant DL385 Gen10 Plus v2",
+  "nodes_count": 3,
+  "nodes_description": "2 CPUs AMD EPYC 7413, 24 cores/CPU, 3 GPUs A40, 512GB RAM, 1788GB SSD, 894GB SSD, 1 x 10Gb Ethernet",
   "priority": 202301,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus25/abacus25.json b/data/grid5000/sites/rennes/clusters/abacus25/abacus25.json
index 2042dfcad9965a457da00802f397ebff9a866609..75c7f5859dfe6e4d54d26d42cb985b11ddf6bb2a 100644
--- a/data/grid5000/sites/rennes/clusters/abacus25/abacus25.json
+++ b/data/grid5000/sites/rennes/clusters/abacus25/abacus25.json
@@ -877,6 +877,8 @@
     }
   ],
   "model": "HPE ProLiant DL385 Gen10+ v2",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs AMD EPYC 7413, 24 cores/CPU, 3 GPUs A40, 512GB RAM, 3x894GB SSD, 1 x 10Gb Ethernet",
   "priority": 202310,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/abacus26/abacus26.json b/data/grid5000/sites/rennes/clusters/abacus26/abacus26.json
index c15ac38c34bd39d1941d2a193299a6cd02516ae8..52c6cc47176f73ed73026a49bac317520e9b076e 100644
--- a/data/grid5000/sites/rennes/clusters/abacus26/abacus26.json
+++ b/data/grid5000/sites/rennes/clusters/abacus26/abacus26.json
@@ -79,6 +79,8 @@
     }
   ],
   "model": "HPE ProLiant DL380 Gen11",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6442Y, 24 cores/CPU, 2 GPUs L40S, 256GB RAM, 1490GB SSD, 1 x 10Gb Ethernet",
   "priority": 202510,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus27/abacus27.json b/data/grid5000/sites/rennes/clusters/abacus27/abacus27.json
index 8a0aa1376caefc590f04b1c8a4d8881962f9cf44..17086c8d584208fae88b60593114757990f56edd 100644
--- a/data/grid5000/sites/rennes/clusters/abacus27/abacus27.json
+++ b/data/grid5000/sites/rennes/clusters/abacus27/abacus27.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "ProLiant DL385 Gen11",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 9254, 24 cores/CPU, 3 GPUs H100 NVL, 512GB RAM, 5961GB SSD, 1 x 10Gb Ethernet",
   "priority": 202511,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json b/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
index 4e433514e00d795f17618c0e9ba5545c5e994100..a2388c98a8005826a667eb1b0a2c71831491efa8 100644
--- a/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
+++ b/data/grid5000/sites/rennes/clusters/abacus28/abacus28.json
@@ -5,9 +5,412 @@
   "kavlan": true,
   "manufactured_at": "2020-12-05",
   "metrics": [
-
+    {
+      "description": "Front node ambient temperature reported by BMC, in celsius",
+      "name": "bmc_ambient_temp_celsius",
+      "period": 5000,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Power consumption of node reported by BMC, in watt",
+      "name": "bmc_node_power_watt",
+      "period": 5000,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Voltage of PSU 1 reported by BMC, in volt",
+      "labels": {
+        "psu": "1"
+      },
+      "name": "bmc_psu_voltage_volt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Voltage of PSU 2 reported by BMC, in volt",
+      "labels": {
+        "psu": "2"
+      },
+      "name": "bmc_psu_voltage_volt",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Current of PSU 1 reported by BMC, in amp",
+      "labels": {
+        "psu": "1"
+      },
+      "name": "bmc_psu_current_amp",
+      "optional_period": 5000,
+      "period": 0,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Current of PSU 2 reported by BMC, in amp",
+      "labels": {
+        "psu": "2"
+      },
+      "name": "bmc_psu_current_amp",
+      "optional_period": 5000,
+      "period": 0,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Cumulated power consumption of node reported by BMC, in watt-hour",
+      "name": "bmc_node_power_watthour_total",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 1A reported by BMC, in rpm",
+      "labels": {
+        "fan": "1a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 1B reported by BMC, in rpm",
+      "labels": {
+        "fan": "1b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 2A reported by BMC, in rpm",
+      "labels": {
+        "fan": "2a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 2B reported by BMC, in rpm",
+      "labels": {
+        "fan": "2b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 3A reported by BMC, in rpm",
+      "labels": {
+        "fan": "3a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 3B reported by BMC, in rpm",
+      "labels": {
+        "fan": "3b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 4A reported by BMC, in rpm",
+      "labels": {
+        "fan": "4a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 4B reported by BMC, in rpm",
+      "labels": {
+        "fan": "4b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 5A reported by BMC, in rpm",
+      "labels": {
+        "fan": "5a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 5B reported by BMC, in rpm",
+      "labels": {
+        "fan": "5b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 6A reported by BMC, in rpm",
+      "labels": {
+        "fan": "6a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 6B reported by BMC, in rpm",
+      "labels": {
+        "fan": "6b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 7A reported by BMC, in rpm",
+      "labels": {
+        "fan": "7a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 7B reported by BMC, in rpm",
+      "labels": {
+        "fan": "7b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 8A reported by BMC, in rpm",
+      "labels": {
+        "fan": "8a"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.15",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Speed of Fan 8B reported by BMC, in rpm",
+      "labels": {
+        "fan": "8b"
+      },
+      "name": "bmc_fan_speed_rpm",
+      "optional_period": 5000,
+      "period": 0,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.16",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Temperature of CPU 1 reported by BMC, in celsius",
+      "labels": {
+        "cpu": "1"
+      },
+      "name": "bmc_cpu_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Temperature of CPU 2 reported by BMC, in celsius",
+      "labels": {
+        "cpu": "2"
+      },
+      "name": "bmc_cpu_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Temperature of exhausted air reported by BMC, in celsius",
+      "name": "bmc_exhaust_temp_celsius",
+      "optional_period": 5000,
+      "period": 0,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "DCGM_FI_DEV_SM_CLOCK",
+          "DCGM_FI_DEV_MEM_CLOCK",
+          "DCGM_FI_DEV_GPU_TEMP",
+          "DCGM_FI_DEV_POWER_USAGE",
+          "DCGM_FI_DEV_MEM_COPY_UTIL"
+        ],
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    }
   ],
   "model": "Dell PowerEdge C4140",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4216, 16 cores/CPU, 4 GPUs Tesla V100-SXM2-32GB, 384GB RAM, 447GB SSD, 1 x 10Gb Ethernet",
   "priority": 202112,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus3/abacus3.json b/data/grid5000/sites/rennes/clusters/abacus3/abacus3.json
index 696de79cecc90c688f7096b86ec4931d45c03e70..068cf0903cd74c6d3fc73c6d1152918a6223d537 100644
--- a/data/grid5000/sites/rennes/clusters/abacus3/abacus3.json
+++ b/data/grid5000/sites/rennes/clusters/abacus3/abacus3.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge T640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon E5-2620 v4, 8 cores/CPU, 4 GPUs RTX A5000, 128GB RAM, 278GB HDD, 893GB HDD, 7451GB HDD, 1 x 1Gb Ethernet",
   "priority": 201807,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus4/abacus4.json b/data/grid5000/sites/rennes/clusters/abacus4/abacus4.json
index 134470948b1060885a1c868231628eb985ed9d7d..283e15fcd37d62cf322aac9ccef1c0c588f2b103 100644
--- a/data/grid5000/sites/rennes/clusters/abacus4/abacus4.json
+++ b/data/grid5000/sites/rennes/clusters/abacus4/abacus4.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R740",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4114, 10 cores/CPU, 2 GPUs A40, 128GB RAM, 893GB HDD, 1 x 1Gb Ethernet",
   "priority": 201811,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/abacus5/abacus5.json b/data/grid5000/sites/rennes/clusters/abacus5/abacus5.json
index 7a77b4e6848182097185f2151c79a1d01be36be9..de4a20894088983711a89b3fcfacd75ceda41cc0 100644
--- a/data/grid5000/sites/rennes/clusters/abacus5/abacus5.json
+++ b/data/grid5000/sites/rennes/clusters/abacus5/abacus5.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R740",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5115, 10 cores/CPU, 2 GPUs Tesla P100-PCIE-16GB, 192GB RAM, 1116GB HDD, 1 x 1Gb Ethernet",
   "priority": 201905,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus8/abacus8.json b/data/grid5000/sites/rennes/clusters/abacus8/abacus8.json
index 65cdd1845a5927860c4997da7b4c2dc77fa92780..59d4574aa4267bbfbb7e147e7b3bd70dd8cc94b7 100644
--- a/data/grid5000/sites/rennes/clusters/abacus8/abacus8.json
+++ b/data/grid5000/sites/rennes/clusters/abacus8/abacus8.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R7920",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5120, 14 cores/CPU, 2 GPUs Quadro P6000, 192GB RAM, 2x476GB SSD, 1 x 1Gb Ethernet",
   "priority": 201911,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json b/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json
index 31a658183d00be7fc81a8c7d11b18a1dcb519a41..9a1ca8ac31dd027f0ed0e4430327ffc57669a0b0 100644
--- a/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json
+++ b/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C4140",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4114, 10 cores/CPU, 4 GPUs Tesla V100-SXM2-32GB, 192GB RAM, 223GB HDD, 1 x 10Gb Ethernet",
   "priority": 201912,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json b/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json
index 0eec19ca07e6c4d89f1b27478fdbd94c784d5d50..abdedad0a59c892c34feb2b392aaea80c2b70a4b 100644
--- a/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json
+++ b/data/grid5000/sites/rennes/clusters/paradoxe/paradoxe.json
@@ -653,6 +653,8 @@
     }
   ],
   "model": "HPE Proliant DL360 Gen10+",
+  "nodes_count": 32,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5320, 26 cores/CPU, 384GB RAM, 2x1788GB SSD, 1 x 25Gb Ethernet",
   "priority": 202305,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
index 603137c7c29d86fbcce8c773331288bdfa73912c..93aa37e26f4069ac48036f890cad60debee849e9 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
@@ -538,6 +538,8 @@
     }
   ],
   "model": "Dell PowerEdge R630",
+  "nodes_count": 28,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630 v3, 8 cores/CPU, 128GB RAM, 5x558GB HDD, 186GB SSD, 2 x 10Gb Ethernet",
   "priority": 201501,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon1/roazhon1.json b/data/grid5000/sites/rennes/clusters/roazhon1/roazhon1.json
index 294033c472482f62e3b9fd47eef4034cb1245375..1fcaa4dadde839dd50ad791ff2b67eb85bc1b74a 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon1/roazhon1.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon1/roazhon1.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6154, 18 cores/CPU, 384GB RAM, 744GB HDD, 1 x 1Gb Ethernet",
   "priority": 201809,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon10/roazhon10.json b/data/grid5000/sites/rennes/clusters/roazhon10/roazhon10.json
index c3a7693d6bb29425cb67853724836bf46da8e8a2..73b0ca9bae180f9dcc1b5780593062bfacecc4b0 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon10/roazhon10.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon10/roazhon10.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge MX740c",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5220, 18 cores/CPU, 384GB RAM, 223GB HDD, 1787GB HDD, 1 x 10Gb Ethernet",
   "priority": 201909,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon11/roazhon11.json b/data/grid5000/sites/rennes/clusters/roazhon11/roazhon11.json
index 09fd389dd05396f48e52ceb363a9f34258d15477..571c6a257dde199028395820098509d99361c940 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon11/roazhon11.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon11/roazhon11.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6220",
+  "nodes_count": 3,
+  "nodes_description": "2 CPUs Intel Xeon E5-2660, 8 cores/CPU, 64GB RAM, 556GB HDD, 1 x 1Gb Ethernet",
   "priority": 201209,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon12/roazhon12.json b/data/grid5000/sites/rennes/clusters/roazhon12/roazhon12.json
index 70763dab4fbd9e34dad612c17871bd9c240b29a8..7451fde88f5a3aae1d02979cdbe59d47aeeab5ed 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon12/roazhon12.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon12/roazhon12.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6220",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2660, 8 cores/CPU, 128GB RAM, 556GB HDD, 1 x 1Gb Ethernet",
   "priority": 201209,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon13/roazhon13.json b/data/grid5000/sites/rennes/clusters/roazhon13/roazhon13.json
index 4bec9ac448553d43ec4b6bacd76e6eda0ade7071..a337b6205472ad7a66405f67413bdd1bd8690c92 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon13/roazhon13.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon13/roazhon13.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6420",
+  "nodes_count": 8,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6254, 18 cores/CPU, 384GB RAM, 931GB HDD, 1 x 10Gb Ethernet",
   "priority": 201909,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon2/roazhon2.json b/data/grid5000/sites/rennes/clusters/roazhon2/roazhon2.json
index 36525b287775d85ad7e93a4ee3ef0de928356228..0ccab51d315034c8d7affac5d7d4ab848a91b5ac 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon2/roazhon2.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon2/roazhon2.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5120, 14 cores/CPU, 256GB RAM, 744GB HDD, 14GB HDD, 1 x 1Gb Ethernet",
   "priority": 201810,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon3/roazhon3.json b/data/grid5000/sites/rennes/clusters/roazhon3/roazhon3.json
index 6c5411635f9bdbad192beb0721a093ed9194500f..219ed3dd393f02f847c02e28869f5ed6e3fc56fb 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon3/roazhon3.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon3/roazhon3.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge R640",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6142, 16 cores/CPU, 1024GB RAM, 2x1489GB SSD, 1 x 10Gb Ethernet",
   "priority": 201811,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon4/roazhon4.json b/data/grid5000/sites/rennes/clusters/roazhon4/roazhon4.json
index 8c5a850561fca209f1c16e0966697f99c79baa40..9bdcb973f8ad93bf6e7e3a7ad15e6d3032bf34d5 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon4/roazhon4.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon4/roazhon4.json
@@ -252,6 +252,8 @@
     }
   ],
   "model": "Dell PowerEdge R7525",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7H12, 64 cores/CPU, 512GB RAM, 447GB HDD, 1863GB HDD, 1 x 1Gb Ethernet",
   "priority": 202012,
   "queues": [
     "production",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon5/roazhon5.json b/data/grid5000/sites/rennes/clusters/roazhon5/roazhon5.json
index dfd706fc070ae6f615fa41cd7a3ff810682a2fe8..1241a730f9b5ef103c6c391827098d7299ec2d72 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon5/roazhon5.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon5/roazhon5.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge M630",
+  "nodes_count": 12,
+  "nodes_description": "2 CPUs Intel Xeon E5-2660 v3, 10 cores/CPU, 128GB RAM, 557GB HDD, 1 x 1Gb Ethernet",
   "priority": 201504,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon6/roazhon6.json b/data/grid5000/sites/rennes/clusters/roazhon6/roazhon6.json
index 87bd7bf92f366ffcb1d95e224097901dbda5517d..ae278660a74214ffabff2b28f3cea387d47be595 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon6/roazhon6.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon6/roazhon6.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge M630",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 192GB RAM, 1116GB HDD, 1 x 1Gb Ethernet",
   "priority": 201710,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon7/roazhon7.json b/data/grid5000/sites/rennes/clusters/roazhon7/roazhon7.json
index cbfd60592d0f16c51fb17c99dec3d97dfe5a4424..7bd5e1b0c2c8b3c3cf3741075d669663d2f4b34b 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon7/roazhon7.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon7/roazhon7.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6320",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 128GB RAM, 931GB HDD, 1 x 10Gb Ethernet",
   "priority": 201706,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon8/roazhon8.json b/data/grid5000/sites/rennes/clusters/roazhon8/roazhon8.json
index bdb9931f560f863ad9ecbbf60f4b4a806a463458..e968d5577e6f53826a5fbd46bfbe01fc90b41c84 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon8/roazhon8.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon8/roazhon8.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6320",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v4, 12 cores/CPU, 256GB RAM, 931GB HDD, 1 x 10Gb Ethernet",
   "priority": 201706,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/rennes/clusters/roazhon9/roazhon9.json b/data/grid5000/sites/rennes/clusters/roazhon9/roazhon9.json
index 23e76ff0c80e2b86d4c2b92a749e33e0879fc145..8cc991fbd65c33c132407a1623494bb66664f0ce 100644
--- a/data/grid5000/sites/rennes/clusters/roazhon9/roazhon9.json
+++ b/data/grid5000/sites/rennes/clusters/roazhon9/roazhon9.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6420",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon Gold 5118, 12 cores/CPU, 512GB RAM, 1116GB HDD, 1 x 10Gb Ethernet",
   "priority": 201712,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/sophia/clusters/esterel10/esterel10.json b/data/grid5000/sites/sophia/clusters/esterel10/esterel10.json
index 6c2db797ed505906f80116366fc2e17445b284a4..5ec7cc537a7135d39bf19060d05f4fb9c6c5f8d4 100644
--- a/data/grid5000/sites/sophia/clusters/esterel10/esterel10.json
+++ b/data/grid5000/sites/sophia/clusters/esterel10/esterel10.json
@@ -79,6 +79,8 @@
     }
   ],
   "model": "Dell T630",
+  "nodes_count": 3,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 4 GPUs GeForce GTX 1080 Ti, 128GB RAM, 1490GB SSD, 2x558GB HDD, 1 x 1Gb Ethernet, 1 x 56Gb InfiniBand",
   "priority": 201811,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json b/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
index 7a4405e86e97a62f613d052ef2459067d7ba58b5..fbbf8fcd8036113619273f0d6330ff2b1b81353c 100644
--- a/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
+++ b/data/grid5000/sites/sophia/clusters/esterel41/esterel41.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "DL380 Gen11",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6426Y, 16 cores/CPU, 2 GPUs L40, 512GB RAM, 446GB SSD, 2681GB SSD, 1 x 1Gb Ethernet, 1 x 56Gb InfiniBand",
   "priority": 202503,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/sophia/clusters/esterel5/esterel5.json b/data/grid5000/sites/sophia/clusters/esterel5/esterel5.json
new file mode 100644
index 0000000000000000000000000000000000000000..3ae543adf4b437f84602b8c53204247890c07716
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel5/esterel5.json
@@ -0,0 +1,93 @@
+{
+  "boot_type": "bios",
+  "created_at": "Tue, 25 Feb 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": false,
+  "manufactured_at": "2016-06-08",
+  "metrics": [
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "Default subset of metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "DCGM_FI_DEV_SM_CLOCK",
+          "DCGM_FI_DEV_MEM_CLOCK",
+          "DCGM_FI_DEV_GPU_TEMP",
+          "DCGM_FI_DEV_POWER_USAGE",
+          "DCGM_FI_DEV_MEM_COPY_UTIL"
+        ],
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Nvidia DCGM Exporter",
+      "name": "prom_nvgpu_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9400,
+        "protocol": "prometheus"
+      }
+    }
+  ],
+  "model": "Dell PowerEdge T630",
+  "nodes_count": 2,
+  "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 3 GPUs GeForce GTX 1080, 128GB RAM, 1862GB HDD, 1489GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+  "priority": 201706,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "esterel5",
+  "warranty_end": "2021-06-08"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..9980ef7c885944cadbd3a5876b6b16cf3adf2b18
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json
@@ -0,0 +1,272 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/22/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2016-06-08",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T630",
+    "serial": "HHS9DD2",
+    "warranty_end": "2021-06-08"
+  },
+  "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia1",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    }
+  },
+  "main_memory": {
+    "ram_size": 137438953472
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "ip": "172.16.131.5",
+      "ip6": "2001:660:4406:800:4::5",
+      "kavlan": false,
+      "mac": "18:66:da:55:25:ab",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "eno1",
+      "network_address": "esterel5-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-6",
+      "switch_port": "1/1/14",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": false,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "18:66:da:55:25:ac",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.35.5100",
+      "guid": "0xe41d2d0300508681",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.5",
+      "kavlan": false,
+      "mac": "e4:1d:2d:03:00:50:86:81",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel5-1-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.5",
+      "kavlan": false,
+      "mac": "18:66:da:55:25:ad",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel5-1-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel5",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 35200000000,
+    "node_flops": 704000000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 26214400,
+    "clock_speed": 2200000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz",
+    "vendor": "Intel",
+    "version": "E5-2630 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da05237da001ef5b1a60da52fd9",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H730 Adp",
+      "size": 1999307276288,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da05237da001efabb4d24dc5b3f",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SSD",
+      "model": "PERC H730 Adp",
+      "size": 1599741100032,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel5-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..05278213c575621fa16e3a084147a8eb50f6f562
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json
@@ -0,0 +1,272 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/22/2024",
+    "vendor": "Dell Inc.",
+    "version": "2.19.0"
+  },
+  "bmc_version": "2.86.86.86",
+  "chassis": {
+    "manufactured_at": "2017-03-30",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T630",
+    "serial": "987KXJ2",
+    "warranty_end": "2022-03-30"
+  },
+  "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia1",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "6.1",
+      "cores": 2560,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 8589934592,
+      "microarchitecture": "Pascal",
+      "model": "GeForce GTX 1080",
+      "performance": {
+        "fp-16": 138600000000,
+        "fp-32": 8872000000000,
+        "fp-64": 277200000000
+      },
+      "power_default_limit": "200.00 W",
+      "vbios_version": "86.04.17.40.06",
+      "vendor": "Nvidia"
+    }
+  },
+  "main_memory": {
+    "ram_size": 137438953472
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "ip": "172.16.131.6",
+      "ip6": "2001:660:4406:800:4::6",
+      "kavlan": false,
+      "mac": "18:66:da:97:71:9a",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": true,
+      "mounted": true,
+      "name": "eno1",
+      "network_address": "esterel5-2.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-6",
+      "switch_port": "1/1/15",
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": false,
+      "firmware_version": "1.67, 0x80000fae, 19.5.12",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "18:66:da:97:71:9b",
+      "management": false,
+      "model": "I350 Gigabit Network Connection",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.36.5120",
+      "guid": "0x248a070300f05191",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.6",
+      "kavlan": false,
+      "mac": "24:8a:07:03:00:f0:51:91",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel5-2-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.6",
+      "kavlan": false,
+      "mac": "18:66:da:97:71:9c",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel5-2-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel5",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 35200000000,
+    "node_flops": 704000000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 262144,
+    "cache_l3": 26214400,
+    "clock_speed": 2200000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Broadwell",
+    "microcode": "0xb000040",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz",
+    "vendor": "Intel",
+    "version": "E5-2630 v4"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da09b4e0f0020909b777e55a3d0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H730 Adp",
+      "size": 1999307276288,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x61866da09b4e0f0020909ca6905c1450",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SSD",
+      "model": "PERC H730 Adp",
+      "size": 1599741100032,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel5-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json b/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json
index eb8e730dcb3754571fe2aa757a2ca847cac3e70d..c78ea4d1f325fb97e9bbf2d6f5b6058475f469c9 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json
@@ -52,6 +52,8 @@
     }
   ],
   "model": "Dell PowerEdge C6220 II",
+  "nodes_count": 8,
+  "nodes_description": "2 CPUs Intel Xeon E5-2650 v2, 8 cores/CPU, 256GB RAM, 931GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
   "priority": 201509,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/sophia/clusters/mercantour6/mercantour6.json b/data/grid5000/sites/sophia/clusters/mercantour6/mercantour6.json
new file mode 100644
index 0000000000000000000000000000000000000000..6bdbe4767c62d9ac377cc1603fbd69dfab0b764f
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour6/mercantour6.json
@@ -0,0 +1,66 @@
+{
+  "boot_type": "bios",
+  "created_at": "Thu, 27 Feb 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": false,
+  "manufactured_at": "2020-10-05",
+  "metrics": [
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    }
+  ],
+  "model": "Dell PowerEdge R7525",
+  "nodes_count": 1,
+  "nodes_description": "2 CPUs AMD EPYC 7542, 32 cores/CPU, 1024GB RAM, 223GB SSD, 1786GB SSD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+  "priority": 202010,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "mercantour6",
+  "warranty_end": "2027-10-07"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json b/data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..d0de74a074c610270885cc17ea430f7dd0e6a7b2
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json
@@ -0,0 +1,259 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 64,
+    "nb_procs": 2,
+    "nb_threads": 128,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "02/03/2025",
+    "vendor": "Dell Inc.",
+    "version": "2.18.1"
+  },
+  "bmc_version": "7.20.10.05",
+  "chassis": {
+    "manufactured_at": "2020-10-05",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R7525",
+    "serial": "425FY63",
+    "warranty_end": "2027-10-07"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 1099511627776
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a7",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a8",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b7",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b8",
+      "size": 68719476736,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "tg3",
+      "enabled": true,
+      "firmware_version": "FFV23.11.4 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "ip": "172.16.130.46",
+      "ip6": "2001:660:4406:800:3::2e",
+      "kavlan": false,
+      "mac": "f4:02:70:b9:2b:b6",
+      "management": false,
+      "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+      "mountable": true,
+      "mounted": true,
+      "name": "eno1",
+      "network_address": "mercantour6-1.sophia.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": null,
+      "switch_port": null,
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth1",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV23.11.4 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f4:02:70:b9:2b:b7",
+      "management": false,
+      "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.42.5000",
+      "guid": "0x043f72030017fd91",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.46",
+      "kavlan": false,
+      "mac": "04:3f:72:03:00:17:fd:91",
+      "management": false,
+      "model": "MT27520 Family [ConnectX-3 Pro]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour6-1-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.130.46",
+      "kavlan": false,
+      "mac": "70:b5:e8:d7:6a:4a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "mercantour6-1-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "mercantour6",
+  "operating_system": {
+    "cstate_driver": "acpi_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 46400000000,
+    "node_flops": 2969600000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 524288,
+    "cache_l3": 16777216,
+    "clock_speed": 2900000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Zen 2",
+    "microcode": "0x830107d",
+    "model": "AMD EPYC",
+    "other_description": "AMD EPYC 7542 32-Core Processor",
+    "vendor": "AMD",
+    "version": 7542
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025021810",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80d622090027c144d0ef5cacdf",
+      "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0",
+      "firmware_version": 5.16,
+      "id": "disk0",
+      "interface": "RAID",
+      "model": "PERC H745 Frnt",
+      "size": 239444426752,
+      "storage": "SSD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x670b5e80d622090027c149ae2f2d9cb4",
+      "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:1:0",
+      "firmware_version": 5.16,
+      "id": "disk1",
+      "interface": "RAID",
+      "model": "PERC H745 Frnt",
+      "size": 1918239768576,
+      "storage": "SSD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "mercantour6-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/musa/musa.json b/data/grid5000/sites/sophia/clusters/musa/musa.json
index c6165e565f48c2d0a01c0372cc5c7f235c618521..f9df1c0ce13aede7121c2eab78ab34b5dcfd2f82 100644
--- a/data/grid5000/sites/sophia/clusters/musa/musa.json
+++ b/data/grid5000/sites/sophia/clusters/musa/musa.json
@@ -1113,6 +1113,8 @@
     }
   ],
   "model": "ProLiant DL385 Gen11",
+  "nodes_count": 6,
+  "nodes_description": "2 CPUs AMD EPYC 9254, 24 cores/CPU, 2 GPUs H100 NVL, 512GB RAM, 5961GB SSD, 1 x 25Gb Ethernet",
   "priority": 202512,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
index 7b0891ad48381c23439de9d1d5df818f7bbe59fb..1fe334adad18c69b9b83139200910a5ddf4dbd05 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 21600,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
index 999ba92171cd3cc7720b9b9072bacdcc57f737ad..f12de964b9981d5e47d7acf4f81c4f89d0f9e519 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 21600,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
index aacb9d0cd5ebeb9f49c51368c19da3b1e5c88336..460ae0d05c6248fa78bf24fee540b8b084de7722 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 86400,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
index b665fc2f27dc7835be93dd65f218878157c7ce5e..9f7556e7ba1f679b7368fc7bc03fc83ba778a8b8 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 86400,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
index 76577ac6f765c51107ca011d9eabf981459e20f6..09c6cbe56671da056a191c919a389d0bc359e6f7 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 172800,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
index 4f850a9d1b1acfc78221077e63aeac01b4aa0437..376414baf9f95e98fea7bc36b8c464ef67adc189 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
@@ -296,7 +296,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 604800,
+    "max_walltime": 172800,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/sophia/clusters/uvb/uvb.json b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
index 171094abfdc5b1dc6eda7ca91a6e924e3136a343..74c345a739b90a75db48a0839abbe496ee0b2a6e 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/uvb.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
@@ -51,6 +51,8 @@
     }
   ],
   "model": "Dell PowerEdge C6100",
+  "nodes_count": 44,
+  "nodes_description": "2 CPUs Intel Xeon X5670, 6 cores/CPU, 96GB RAM, 232GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
   "priority": 201101,
   "queues": [
     "default",
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index e3e4cddaca844fc0ed6be267912e8d926ccbb9e9..86774f608b1d6ea53af92166f444b33eb75dd9ec 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -219,10 +219,14 @@
           "uid": "lag4"
         },
         {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/42",
+          "uid": "sw-6"
         },
         {
           "kind": "other",
-          "rate": 1000000000,
+          "rate": 10000000000,
           "snmp_name": "1/1/43",
           "uid": "LABO"
         },
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-2.json b/data/grid5000/sites/sophia/network_equipments/sw-2.json
index 0927e9ee665f8b04203c03a9abdf6fa5e6a70d5f..6a0d6272d5f6aeb696993491cffbaacb760d593d 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-2.json
@@ -169,6 +169,12 @@
           "rate": 10000000000,
           "snmp_name": "1/1/49",
           "uid": "gw"
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/50",
+          "uid": "swadmin-5"
         }
       ],
       "rate": 1000000000,
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-6.json b/data/grid5000/sites/sophia/network_equipments/sw-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..af4c7525a370b5e0a17edb094ddf4ee613eb589d
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/sw-6.json
@@ -0,0 +1,113 @@
+{
+  "ip": "172.17.143.240",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/13",
+          "uid": "esterel1-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/14",
+          "uid": "esterel5-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/15",
+          "uid": "esterel5-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/16",
+          "uid": "esterel6-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/17",
+          "uid": "esterel7-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/18",
+          "uid": "esterel7-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/19",
+          "uid": "esterel27-1"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "router",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
+          "uid": "gw"
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/26",
+          "uid": "swadmin-6"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sw-6",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-2.json b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..582edbf0da87faadd3bea29a6e78f7655b81a525
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
@@ -0,0 +1,106 @@
+{
+  "ip": "172.17.143.229",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/1",
+          "uid": "musa-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/2",
+          "uid": "musa-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/3",
+          "uid": "musa-3-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/4",
+          "uid": "musa-4-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/5",
+          "uid": "musa-5-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/6",
+          "uid": "musa-6-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/7",
+          "uid": "esterel10-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/8",
+          "uid": "esterel10-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/9",
+          "uid": "esterel10-3-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/10",
+          "uid": "esterel41-1-bmc"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/24",
+          "uid": "sw-2"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "swadmin-2",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-3.json b/data/grid5000/sites/sophia/network_equipments/swadmin-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..159f6ea038ad2f5fdac100befa4db5af6aaa12c7
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-3.json
@@ -0,0 +1,147 @@
+{
+  "ip": "172.17.143.227",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/1",
+          "uid": "uvb-11-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/2",
+          "uid": "uvb-12-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/3",
+          "uid": "mercantour1-15-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/4",
+          "uid": "mercantour1-16-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/5",
+          "uid": "mercantour1-11-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/6",
+          "uid": "mercantour1-12-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/7",
+          "uid": "mercantour1-7-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/8",
+          "uid": "mercantour1-8-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/9",
+          "uid": "mercantour1-3-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/10",
+          "uid": "mercantour1-4-bmc"
+        },
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/12",
+          "uid": "mercantour2-5-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/13",
+          "uid": "mercantour1-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/14",
+          "uid": "mercantour1-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/15",
+          "uid": "mercantour1-6-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/16",
+          "uid": "mercantour1-5-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/17",
+          "uid": "mercantour1-10-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/18",
+          "uid": "mercantour1-9-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/19",
+          "uid": "mercantour1-14-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/20",
+          "uid": "mercantour1-13-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/21",
+          "uid": "uvb-10-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/22",
+          "uid": "uvb-9-bmc"
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/24",
+          "uid": "sw-2"
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/26",
+          "uid": "swadmin-4"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "swadmin-3",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-4.json b/data/grid5000/sites/sophia/network_equipments/swadmin-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..86cb27645fa25cee3875fd198ead7c646e47e3b4
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-4.json
@@ -0,0 +1,106 @@
+{
+  "ip": "172.17.143.225",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/1",
+          "uid": "mercantour2-4-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/2",
+          "uid": "mercantour2-3-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/3",
+          "uid": "mercantour2-8-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/4",
+          "uid": "mercantour2-7-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/5",
+          "uid": "musa-5-bmc"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/21",
+          "uid": "mercantour6-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/22",
+          "uid": "mercantour2-6-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/23",
+          "uid": "mercantour2-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/24",
+          "uid": "mercantour2-2-bmc"
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
+          "uid": "swadmin-3"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "swadmin-4",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-5.json b/data/grid5000/sites/sophia/network_equipments/swadmin-5.json
new file mode 100644
index 0000000000000000000000000000000000000000..364dd724680cd8414d27f748404a0968f17ff013
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-5.json
@@ -0,0 +1,79 @@
+{
+  "ip": "172.17.143.223",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
+          "uid": "sw-2"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "swadmin-5",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..3bb0c06cd6624b5230c7960bb90e10a923dbcf71
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json
@@ -0,0 +1,100 @@
+{
+  "ip": "172.17.143.221",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/1",
+          "uid": "esterel1-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/2",
+          "uid": "esterel5-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/3",
+          "uid": "esterel5-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/4",
+          "uid": "esterel6-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/5",
+          "uid": "esterel7-1-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/6",
+          "uid": "esterel7-2-bmc"
+        },
+        {
+          "kind": "other",
+          "snmp_name": "1/1/7",
+          "uid": "esterel27-1-bmc"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "rate": 10000000000,
+          "snmp_name": "1/1/25",
+          "uid": "sw-6"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 2930F",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "swadmin-6",
+  "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json
index 410f5a13f53a6e47a30c0d056012e76af9dd7164..746370ed4b4fce712e6b2d795a73616c5c54ef11 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json
@@ -501,6 +501,8 @@
     }
   ],
   "model": "HPE Proliant DL360 Gen10+",
+  "nodes_count": 10,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4314, 16 cores/CPU, 512GB RAM, 894GB SSD, 3x2235GB HDD, 2 x 25Gb Ethernet",
   "priority": 202212,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/toulouse/clusters/estats/estats.json b/data/grid5000/sites/toulouse/clusters/estats/estats.json
index 9cca6ee1a1ddc2de19c541e358b6654222ea0d35..20fad92a2d0c9aa2f2158c59e82961990a66c83c 100644
--- a/data/grid5000/sites/toulouse/clusters/estats/estats.json
+++ b/data/grid5000/sites/toulouse/clusters/estats/estats.json
@@ -8,6 +8,8 @@
 
   ],
   "model": "Connecttech/Nvidia Jetson AGX Xavier",
+  "nodes_count": 12,
+  "nodes_description": "1 CPU Carmel Unknown, 8 cores/CPU, 1 GPU AGX Xavier, 32GB RAM, 1863GB SSD, 1 x 1Gb Ethernet",
   "priority": 202312,
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
index 92e475cf9d97d290de4848ab2ad3ff40d81bf1b5..b9d089ae74c71bf261acf3fcc22f76ef4e58fe02 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/montcalm.json
@@ -787,6 +787,8 @@
     }
   ],
   "model": "HPE Proliant DL360 Gen10+",
+  "nodes_count": 10,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4314, 16 cores/CPU, 256GB RAM, 894GB SSD, 1 x 10Gb Ethernet",
   "priority": 202211,
   "queues": [
     "default",
diff --git a/input/grid5000/access/group.yaml b/input/grid5000/access/group.yaml
index 4195d4d9a50cf8a05a9425f5027ebfc6bcb272e3..dce252466ee45bc38297efc8b38eb3574d3849ef 100644
--- a/input/grid5000/access/group.yaml
+++ b/input/grid5000/access/group.yaml
@@ -25,13 +25,11 @@ inria_nancy_group: ['%mc-nancy', coast]
 inria_lyon_group: ['%mc-lyon', avalon, chroma, emeraude, maracas ]
 
 # GROUP FOR ALL INRIA
-## economic activity group with access to mc with the same level as other inria team
-economic_activity_inria: [hive, inriastartupstudio, sonaide, feelim, iss-idiscover, iss-manta]
 ## group of guest site that have access to inria mc with the same level as other inria team
 guest_inria: [inria-chile, inria-dsi, inria-sidf, swh, tadaam]
 
 ## all inria (and friends of inria) groups
-inria_group:  ['@inria_rennes_group', '@inria_nancy_group', '@inria_lyon_group', '@economic_activity_inria', '@guest_inria', '%mc-sophia', '%mc-lyon', '%mc-lille', '%mc-grenoble', '%mc-paris', '%mc-saclay', '%mc-bordeaux']
+inria_group:  ['@inria_rennes_group', '@inria_nancy_group', '@inria_lyon_group', '@guest_inria', '%mc-economic-activity', '%mc-sophia', '%mc-lyon', '%mc-lille', '%mc-grenoble', '%mc-paris', '%mc-saclay', '%mc-bordeaux', '%mc-siege']
 
 # OTHER GROUP WITH (MINIMAL) ACCESS TO MC
 
diff --git a/input/grid5000/access/rennes.yaml b/input/grid5000/access/rennes.yaml
index 888bebcd0ba6abedd388528c8a5461d2f4d83f25..a2859090189a4833617786115d4f4457de14ec5b 100644
--- a/input/grid5000/access/rennes.yaml
+++ b/input/grid5000/access/rennes.yaml
@@ -37,14 +37,18 @@ roazhon8: *sairpico-shared
 abacus1: *sairpico-shared
 abacus2: *sairpico-shared
 
-## LINKMEDIA
-abacus3: &linkmedia-exclusive
-    p1: [linkmedia, '@admin']
+## LINKMEDIA & ARTISHAU
+abacus3: &linkmedia-artishau-exclusive
+    p1: [linkmedia, artishau, '@admin']
+    besteffort: ['@inria_group', '@other_groups_with_access']
+abacus10: *linkmedia-artishau-exclusive
+abacus18: *linkmedia-artishau-exclusive
+abacus21: *linkmedia-artishau-exclusive
+
+## ARTISHAU
+abacus26: &artishau-exclusive
+    p1: [artishau, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
-abacus10: *linkmedia-exclusive
-abacus18: *linkmedia-exclusive
-abacus21: *linkmedia-exclusive
-abacus26: *linkmedia-exclusive
 
 ## SIROCCO
 abacus5: &sirocco-exclusive
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index 05826ff0191fa247bf7e1672c9ebd2de4099334f..0888f21bbe99013368f58bbab3e766f9ddc63332 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2218,6 +2218,16 @@ sites:
             chassis:
               manufactured_at: 2017-11-15
               warranty_end: 2024-11-15
+      esterel5:
+        nodes:
+          esterel5-1:
+            chassis:
+              manufactured_at: 2016-06-08
+              warranty_end: 2021-06-08
+          esterel5-2:
+            chassis:
+              manufactured_at: 2017-03-30
+              warranty_end: 2022-03-30
       mercantour2:
         nodes:
           mercantour2-1:
@@ -2252,6 +2262,12 @@ sites:
             chassis:
               manufactured_at: 2015-09-02
               warranty_end: 2020-09-02
+      mercantour6:
+        nodes:
+          mercantour6-1:
+            chassis:
+              manufactured_at: 2020-10-05
+              warranty_end: 2027-10-07
       uvb:
         nodes:
           uvb-10:
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 3d9aa51c0c7162d9cc953b21a1b67d7c837980b9..1d411c3ef8988a594db93370f8479f271cfdd569 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -14,6 +14,7 @@ disk_vendor_model_mapping:
       - PERC H730P Mini
       - PERC H345 Front
       - PERC H745P MX
+      - PERC H745 Frnt
       - PERC H740P Mini
       - DELLBOSS VD
     HPE:
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 24aa1778321021beecb0b29056e129b995f67dd1..5530e276559d102ffed67527fb8e5b66e5f3167d 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -122,12 +122,14 @@ ipv4:
       sophia mercantour4 eth0 0 0 2 40
       sophia mercantour5 eth0 0 0 2 41
       sophia mercantour6 eth0 0 0 2 45
+      sophia mercantour6 ib0 0 0 2 45
       sophia mercantour7 eth0 0 0 2 46
       sophia esterel1 eth0 0 0 3 0
       sophia esterel2 eth0 0 0 3 1
       sophia esterel3 eth0 0 0 3 2
       sophia esterel4 eth0 0 0 3 3
       sophia esterel5 eth0 0 0 3 4
+      sophia esterel5 ib0 0 0 3 4
       sophia esterel6 eth0 0 0 3 6
       sophia esterel7 eth0 0 0 3 7
       sophia esterel8 eth0 0 0 3 9
diff --git a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
index 654be4f5c53d590d9a9f8123f880ee768fdaf90f..d9530e4ef149ea06ad0ea0b0990ee18aa2e2c900 100644
--- a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
+++ b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis.yaml
@@ -1,7 +1,7 @@
 ---
 model: HPE Proliant DL380 Gen11
 created_at: 2025-02-10
-kavlan: false
+kavlan: true
 boot_type: uefi
 exotic: false
 queues:
diff --git a/input/grid5000/sites/grenoble/clusters/kinovis/kinovis_metrics.yaml b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..03c90530a6f9ec3c37a21be92fe25da2ac9cca9c
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/kinovis/kinovis_metrics.yaml
@@ -0,0 +1,63 @@
+---
+metrics:
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+  - name: prom_nvgpu_default_metrics
+    description: Default subset of metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
+      id:
+        - DCGM_FI_DEV_SM_CLOCK
+        - DCGM_FI_DEV_MEM_CLOCK
+        - DCGM_FI_DEV_GPU_TEMP
+        - DCGM_FI_DEV_POWER_USAGE
+        - DCGM_FI_DEV_MEM_COPY_UTIL
+
+  - name: prom_nvgpu_all_metrics
+    description: All metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
diff --git a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
index f89536ec48297a261caeac8348fdeef55520dd1b..c1f60e607e87a5e80190b74a0940d5065dfd38da 100644
--- a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
@@ -12,7 +12,7 @@ skinovis2-prod-01:
   linecards:
     1:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      kavlan_pattern: "%LINECARD%/%PORT%"
+      kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
       rate: 25_000_000_000
       backplane_bps: 400_000_000_000
       kind: node
diff --git a/input/grid5000/sites/grenoble/servers/physical.yaml b/input/grid5000/sites/grenoble/servers/physical.yaml
index d2ffbf5304a6b4369b6eafb464acaa621e0fa986..b237cf88c8f2bbe7761b4ea4b562c31ce2e1177c 100644
--- a/input/grid5000/sites/grenoble/servers/physical.yaml
+++ b/input/grid5000/sites/grenoble/servers/physical.yaml
@@ -14,7 +14,7 @@ digsed:
 
 dighyp1:
   kind: physical
-  alias: [adminfront, af]
+  alias: []
   warranty: 2024-10-19
   serial: 5SS15M2
   network_adapters:
@@ -57,7 +57,7 @@ digwatt:
 
 dignfs:
   kind: physical
-  alias: []
+  alias: [storage1-old]
   warranty: 2025-10-06
   serial: 57JV173
   network_adapters:
@@ -68,16 +68,12 @@ dignfs:
       mac: 2C:EA:7F:42:45:35
     adm:
       ip: 172.17.31.12
-  group_storage:
-    name: storage1
-    size: 55000000000000
-    rate: 50000000000
 
 pve-1:
   kind: physical
   warranty: 2031-07-11
   serial: CZJD1700JN
-  alias: [ntp]
+  alias: [ntp, adminfront]
   network_adapters:
     default:
       ip: 172.16.31.13
@@ -117,6 +113,10 @@ srv-data:
       mac: 5C:ED:8C:F4:A1:EE
     adm:
       ip: 172.17.31.15
+  group_storage:
+    name: storage1
+    size: 162_001_569_447_936
+    rate: 25_000_000_000
 
 srv-data2:
   kind: physical
@@ -132,6 +132,10 @@ srv-data2:
       mac: 5C:ED:8C:F4:64:78
     adm:
       ip: 172.17.31.16
+  group_storage:
+    name: storage2
+    size: 162_001_569_447_936
+    rate: 25_000_000_000
 
 srv-data3:
   kind: physical
@@ -147,3 +151,7 @@ srv-data3:
       mac: 5C:ED:8C:F4:A2:22
     adm:
       ip: 172.17.31.17
+  group_storage:
+    name: storage3
+    size: 360_003_477_176_320
+    rate: 100_000_000_000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index 3ea3c987d4c0d64c455a72adf2b4ba05b784fef8..2042511cd49e74a5fef5029c89b4b736f9957a8a 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -81,6 +81,12 @@ sw-chiclet-2:
         18:
           uid: port-channel4
           kind: channel
+        19:
+          uid: port-channel5
+          kind: channel
+        20:
+          uid: port-channel5
+          kind: channel
         21: 
           uid: gwol-north
           kind: server
@@ -115,3 +121,8 @@ sw-chiclet-2:
       uid: granche-srv2
       kind: server
       rate: 20000000000
+    port-channel5:
+      port: port-channel5
+      uid: pve-3
+      kind: server
+      rate: 10000000000
diff --git a/input/grid5000/sites/lille/servers/physical.yaml b/input/grid5000/sites/lille/servers/physical.yaml
index 19ac45f0c7092575932c39745c522298f424ab13..d3803c691b42015aa6a30c2cdbc191a1067eac6e 100644
--- a/input/grid5000/sites/lille/servers/physical.yaml
+++ b/input/grid5000/sites/lille/servers/physical.yaml
@@ -16,11 +16,16 @@ chiterne:
     - uid: pdu-b2p2
       port: 9
 
-gardin:
+pve-3:
   kind: physical
   warranty: 2025-06-25
   serial: 2SYTKQ2
   network_adapters:
+    default:
+      ip: 172.16.47.9
+      mac: 24:6e:96:dc:f4:2c
+    adm:
+      ip: 172.17.47.9
     bmc:
       ip: 172.17.46.9
       mac: 54:48:10:f4:f9:0c
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.yaml
index d416e76fa5fce06b1d331614fa9519a5455ff305..17980344929604997bdbff2de146e3007353aed7 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-1.yaml
@@ -160,9 +160,9 @@ spirou-1:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.yaml
index 51998062ed490aa2f92a1a139be18939753bf205..7b47b9419a20c4aaf3f46c29870172b5758fdc3c 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-2.yaml
@@ -160,9 +160,9 @@ spirou-2:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.yaml
index 01ae4daca0a2e2fa0e90a5e067f1f4e17fbb2e8d..fc0098b8b232277969f55abf81762e45c52844ae 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-3.yaml
@@ -160,9 +160,9 @@ spirou-3:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.yaml
index 7b5c09fc6ba892c58a62e1af6a2681aed7ecc4b2..7bae9fde31b6e429755c8c577712ea6571d60942 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-4.yaml
@@ -160,9 +160,9 @@ spirou-4:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.yaml
index eea42338c26cb02e2c8a511d3e112e626f025c95..0d498493ac5ecb5e3601e5c83eeba4fabb7cce88 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-5.yaml
@@ -160,9 +160,9 @@ spirou-5:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.yaml
index 9db2fa947abd8590b6475c401e8a6459c49c0ea8..b7c07b17f69e98801ad95f8f55d2b897a4d82c8c 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-6.yaml
@@ -160,9 +160,9 @@ spirou-6:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.yaml
index 2034495d103f52b6f1167f42df01a4416e14c8bb..a3911e88cc399d16ebd0b67c8ec63e284d43a5cd 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-7.yaml
@@ -160,9 +160,9 @@ spirou-7:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.yaml b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.yaml
index 1d5fa0a082a7d757018b804a41dece19c075b66c..a2482484951e51b7b2e2a3d150aa66614fb99967 100644
--- a/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.yaml
+++ b/input/grid5000/sites/louvain/clusters/spirou/nodes/spirou-8.yaml
@@ -160,9 +160,9 @@ spirou-8:
     cstate_driver: intel_idle
     cstate_governor: menu
     ht_enabled: true
-    pstate_driver: none
-    pstate_governor: none
-    turboboost_enabled: false
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
   processor:
     cache_l1d: 49152
     cache_l1i: 32768
diff --git a/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml b/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e6f6fe5eeb2a4fb189683e160c8c3f36d34551e3
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/abacus28/abacus28_metrics.yaml
@@ -0,0 +1,307 @@
+---
+metrics:
+
+  - name: bmc_ambient_temp_celsius
+    description: Front node ambient temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      protocol: snmp
+      id: >-
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
+        == System Board Pwr Consumption }}
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: >-
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
+        == PS1 Current 1 }}
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: >-
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{
+        1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1
+        == PS2 Current 2 }}
+
+  - name: bmc_node_power_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt-hour
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8a"}
+    description: Speed of Fan 8A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.15
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8b"}
+    description: Speed of Fan 8B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.16
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_exhaust_temp_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+
+  - name: prom_nvgpu_default_metrics
+    description: Default subset of metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
+      id:
+        - DCGM_FI_DEV_SM_CLOCK
+        - DCGM_FI_DEV_MEM_CLOCK
+        - DCGM_FI_DEV_GPU_TEMP
+        - DCGM_FI_DEV_POWER_USAGE
+        - DCGM_FI_DEV_MEM_COPY_UTIL
+
+  - name: prom_nvgpu_all_metrics
+    description: All metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400      
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/clusters/esterel5/esterel5.yaml b/input/grid5000/sites/sophia/clusters/esterel5/esterel5.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..088128d35cbd4dbf6e61d18b2ec7950499176b0b
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel5/esterel5.yaml
@@ -0,0 +1,49 @@
+---
+model: Dell PowerEdge T630
+created_at: 2025-02-25
+kavlan: false
+boot_type: bios
+exotic: false
+queues:
+  - admin
+  - testing
+nodes:
+  esterel5-[1-2]:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Broadwell
+      clock_speed: 2200000000
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+      ib0:
+        mounted: true
+        enabled: true
+        mountable: true
+        netmask: 255.255.240.0
+    storage_devices:
+      pci-0000:03:00.0-scsi-0:2:0:0:
+        id: disk0
+        interface: SAS
+      pci-0000:03:00.0-scsi-0:2:1:0:
+        id: disk1
+        interface: SSD
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    nodeset: esterel5
diff --git a/input/grid5000/sites/sophia/clusters/esterel5/esterel5_metrics.yaml b/input/grid5000/sites/sophia/clusters/esterel5/esterel5_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a59d3e58fa6e79bb6cb8b10b5f983dfcdf43b110
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel5/esterel5_metrics.yaml
@@ -0,0 +1,64 @@
+---
+metrics:
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+
+  - name: prom_nvgpu_default_metrics
+    description: Default subset of metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
+      id:
+        - DCGM_FI_DEV_SM_CLOCK
+        - DCGM_FI_DEV_MEM_CLOCK
+        - DCGM_FI_DEV_GPU_TEMP
+        - DCGM_FI_DEV_POWER_USAGE
+        - DCGM_FI_DEV_MEM_COPY_UTIL
+
+  - name: prom_nvgpu_all_metrics
+    description: All metrics from Prometheus Nvidia DCGM Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9400
diff --git a/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.yaml b/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..01a1d9cc4a46fe3b8d755cf2003233df8ca78204
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.yaml
@@ -0,0 +1,147 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel5-1:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: 02/22/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T630
+    serial: HHS9DD2
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 1
+      device: "/dev/nvidia1"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+  main_memory:
+    ram_size: 137438953472
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.5
+      mac: 18:66:da:55:25:ad
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      ip: 172.16.131.5
+      mac: 18:66:da:55:25:ab
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno1
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      mac: 18:66:da:55:25:ac
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno2
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.35.5100
+      guid: '0xe41d2d0300508681'
+      interface: InfiniBand
+      ip: 172.18.131.5
+      mac: e4:1d:2d:03:00:50:86:81
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 26214400
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz
+    vendor: Intel
+    version: E5-2630 v4
+  storage_devices:
+    pci-0000:03:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da05237da001ef5b1a60da52fd9"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 1999307276288
+      storage: HDD
+    pci-0000:03:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da05237da001efabb4d24dc5b3f"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 1599741100032
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.yaml b/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..423dcca349679cfe65159b1ca899b0b0145ac2ad
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.yaml
@@ -0,0 +1,147 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel5-2:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: 02/22/2024
+    vendor: Dell Inc.
+    version: 2.19.0
+  bmc_version: 2.86.86.86
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T630
+    serial: 987KXJ2
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 1
+      device: "/dev/nvidia1"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 8589934592
+      model: GeForce GTX 1080
+      power_default_limit: 200.00 W
+      vbios_version: 86.04.17.40.06
+      vendor: Nvidia
+  main_memory:
+    ram_size: 137438953472
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.6
+      mac: 18:66:da:97:71:9c
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      ip: 172.16.131.6
+      mac: 18:66:da:97:71:9a
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno1
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth1:
+      driver: igb
+      firmware_version: 1.67, 0x80000fae, 19.5.12
+      interface: Ethernet
+      mac: 18:66:da:97:71:9b
+      management: false
+      model: I350 Gigabit Network Connection
+      name: eno2
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.36.5120
+      guid: '0x248a070300f05191'
+      interface: InfiniBand
+      ip: 172.18.131.6
+      mac: 24:8a:07:03:00:f0:51:91
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 26214400
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xb000040'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz
+    vendor: Intel
+    version: E5-2630 v4
+  storage_devices:
+    pci-0000:03:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da09b4e0f0020909b777e55a3d0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 1999307276288
+      storage: HDD
+    pci-0000:03:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x61866da09b4e0f0020909ca6905c1450"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730 Adp
+      size: 1599741100032
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6.yaml b/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ccbc8939329c361f709e4ca95abf5608883c61fc
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6.yaml
@@ -0,0 +1,49 @@
+---
+model: Dell PowerEdge R7525
+created_at: 2025-02-27
+kavlan: false
+boot_type: bios
+exotic: false
+queues:
+  - admin
+  - testing
+nodes:
+  mercantour6-1:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: 'Zen 2'
+      clock_speed: 2900000000
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+      ib0:
+        mounted: true
+        enabled: true
+        mountable: true
+        netmask: 255.255.240.0
+    storage_devices:
+      pci-0000:01:00.0-scsi-0:2:0:0:
+        id: disk0
+        interface: RAID
+      pci-0000:01:00.0-scsi-0:2:1:0:
+        id: disk1
+        interface: RAID
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    nodeset: mercantour6
diff --git a/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6_metrics.yaml b/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3c11d0073c1eaf21ed82b43e7c5efa5407ecd189
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6_metrics.yaml
@@ -0,0 +1,42 @@
+---
+metrics:
+
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
diff --git a/input/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.yaml b/input/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f2cd8c57295de4bb4d9161abdab2603282ba8167
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.yaml
@@ -0,0 +1,146 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour6-1:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 64
+    nb_procs: 2
+    nb_threads: 128
+    platform_type: x86_64
+  bios:
+    release_date: 02/03/2025
+    vendor: Dell Inc.
+    version: 2.18.1
+  bmc_version: 7.20.10.05
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R7525
+    serial: 425FY63
+  main_memory:
+    ram_size: 1099511627776
+  memory_devices:
+    dimm_a1:
+      size: 68719476736
+      technology: dram
+    dimm_a2:
+      size: 68719476736
+      technology: dram
+    dimm_a3:
+      size: 68719476736
+      technology: dram
+    dimm_a4:
+      size: 68719476736
+      technology: dram
+    dimm_a5:
+      size: 68719476736
+      technology: dram
+    dimm_a6:
+      size: 68719476736
+      technology: dram
+    dimm_a7:
+      size: 68719476736
+      technology: dram
+    dimm_a8:
+      size: 68719476736
+      technology: dram
+    dimm_b1:
+      size: 68719476736
+      technology: dram
+    dimm_b2:
+      size: 68719476736
+      technology: dram
+    dimm_b3:
+      size: 68719476736
+      technology: dram
+    dimm_b4:
+      size: 68719476736
+      technology: dram
+    dimm_b5:
+      size: 68719476736
+      technology: dram
+    dimm_b6:
+      size: 68719476736
+      technology: dram
+    dimm_b7:
+      size: 68719476736
+      technology: dram
+    dimm_b8:
+      size: 68719476736
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.46
+      mac: 70:b5:e8:d7:6a:4a
+      management: true
+    eth0:
+      driver: tg3
+      firmware_version: FFV23.11.4 bc 5720-v1.39
+      interface: Ethernet
+      ip: 172.16.130.46
+      mac: f4:02:70:b9:2b:b6
+      management: false
+      model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+      name: eno1
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth1:
+      driver: tg3
+      firmware_version: FFV23.11.4 bc 5720-v1.39
+      interface: Ethernet
+      mac: f4:02:70:b9:2b:b7
+      management: false
+      model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+      name: eno2
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.42.5000
+      guid: '0x043f72030017fd91'
+      interface: InfiniBand
+      ip: 172.18.130.46
+      mac: 04:3f:72:03:00:17:fd:91
+      management: false
+      model: MT27520 Family [ConnectX-3 Pro]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: acpi_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: acpi-cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 524288
+    cache_l3: 16777216
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x830107d'
+    model: AMD EPYC
+    other_description: AMD EPYC 7542 32-Core Processor
+    vendor: AMD
+    version: 7542
+  storage_devices:
+    pci-0000:01:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x670b5e80d622090027c144d0ef5cacdf"
+      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
+      firmware_version: 5.16
+      model: PERC H745 Frnt
+      size: 239444426752
+      storage: SSD
+    pci-0000:01:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x670b5e80d622090027c149ae2f2d9cb4"
+      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:1:0"
+      firmware_version: 5.16
+      model: PERC H745 Frnt
+      size: 1918239768576
+      storage: SSD
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/sophia/clusters/musa/musa.yaml b/input/grid5000/sites/sophia/clusters/musa/musa.yaml
index 4333b375260cc2f0d2781b58cb2601c3bd4d48fb..61d47818dcb1bcbc3220ce080ae41492ba3b4fac 100644
--- a/input/grid5000/sites/sophia/clusters/musa/musa.yaml
+++ b/input/grid5000/sites/sophia/clusters/musa/musa.yaml
@@ -8,6 +8,15 @@ queues:
   - admin
   - production
 nodes:
+  musa-[1-2]:
+    supported_job_types:
+      max_walltime: 21600
+  musa-[3-4]:
+    supported_job_types:
+      max_walltime: 86400
+  musa-[5-6]:
+    supported_job_types:
+      max_walltime: 172800
   musa-[1-6]:
     chassis:
       manufactured_at: 2024-12-09
@@ -15,7 +24,6 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 604800
     processor:
       microarchitecture: Zen 4
       clock_speed: 2_900_000_000
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 9ad8b5b9ddadd0ce9b4e52dc58bfbb7311a8a697..a66e11650fe36eb6654dbbe146f3188c3de8e244 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -137,10 +137,14 @@ gw:
           uid: lag4
           kind: channel
           rate: 100000000000
+        42:
+          uid: sw-6
+          kind: switch
+          rate: 10000000000
         43:
           uid: LABO
           kind: other
-          rate: 1000000000
+          rate: 10000000000
         45:
           uid: sw-3
           kind: switch
@@ -187,4 +191,4 @@ gw:
       kind: server
       rate: 200000000000
       uid: srv-scratch3
-      port: lag7
\ No newline at end of file
+      port: lag7
diff --git a/input/grid5000/sites/sophia/networks/sw-2.yaml b/input/grid5000/sites/sophia/networks/sw-2.yaml
index 1d305ed5bd5ec016fc36ca5337ce4d1b1e0b291d..c0f43f367a8ba876c2570137a93260df949de6c6 100644
--- a/input/grid5000/sites/sophia/networks/sw-2.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-2.yaml
@@ -71,3 +71,7 @@ sw-2:
           uid: gw
           kind: router
           rate: 10000000000
+        50:
+          uid: swadmin-5
+          kind: switch
+          rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/sw-6.yaml b/input/grid5000/sites/sophia/networks/sw-6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..83fc73c15e82c5e30504a469887e2459d960f3c0
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/sw-6.yaml
@@ -0,0 +1,39 @@
+---
+sw-6:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.240
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        13:
+          uid: esterel1-1
+        14:
+          uid: esterel5-1
+        15:
+          uid: esterel5-2
+        16:
+          uid: esterel6-1
+        17:
+          uid: esterel7-1
+        18:
+          uid: esterel7-2
+        19:
+          uid: esterel27-1
+        25:
+          uid: gw
+          kind: router
+          rate: 10000000000
+        26:
+          uid: swadmin-6
+          kind: switch
+          rate: 10000000000
+
diff --git a/input/grid5000/sites/sophia/networks/swadmin-2.yaml b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1268cbf5b76d61f17efd682ff0cc416e235381d4
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
@@ -0,0 +1,49 @@
+---
+swadmin-2:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.229
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        1:
+          uid: musa-1-bmc
+          kind: other
+        2:
+          uid: musa-2-bmc
+          kind: other
+        3:
+          uid: musa-3-bmc
+          kind: other
+        4:
+          uid: musa-4-bmc
+          kind: other
+        5:
+          uid: musa-5-bmc
+          kind: other
+        6:
+          uid: musa-6-bmc
+          kind: other
+        7:
+          uid: esterel10-1-bmc
+          kind: other
+        8:
+          uid: esterel10-2-bmc
+          kind: other
+        9:
+          uid: esterel10-3-bmc
+          kind: other
+        10:
+          uid: esterel41-1-bmc
+          kind: other
+        24:
+          uid: sw-2
+          kind: switch
diff --git a/input/grid5000/sites/sophia/networks/swadmin-3.yaml b/input/grid5000/sites/sophia/networks/swadmin-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d4635f24bed2494431a2a25acd75ffdfbd7a04b9
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-3.yaml
@@ -0,0 +1,86 @@
+---
+swadmin-3:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.227
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        1:
+           uid: uvb-11-bmc
+           kind: other
+        2:
+           uid: uvb-12-bmc
+           kind: other
+        3:
+           uid: mercantour1-15-bmc
+           kind: other
+        4:
+           uid: mercantour1-16-bmc
+           kind: other
+        5:
+           uid: mercantour1-11-bmc
+           kind: other
+        6:
+           uid: mercantour1-12-bmc
+           kind: other
+        7:
+           uid: mercantour1-7-bmc
+           kind: other
+        8:
+           uid: mercantour1-8-bmc
+           kind: other
+        9:
+           uid: mercantour1-3-bmc
+           kind: other
+        10:
+           uid: mercantour1-4-bmc
+           kind: other
+        12:
+           uid: mercantour2-5-bmc
+           kind: other
+        13:
+           uid: mercantour1-2-bmc
+           kind: other
+        14:
+           uid: mercantour1-1-bmc
+           kind: other
+        15:
+           uid: mercantour1-6-bmc
+           kind: other
+        16:
+           uid: mercantour1-5-bmc
+           kind: other
+        17:
+           uid: mercantour1-10-bmc
+           kind: other
+        18:
+           uid: mercantour1-9-bmc
+           kind: other
+        19:
+           uid: mercantour1-14-bmc
+           kind: other
+        20:
+           uid: mercantour1-13-bmc
+           kind: other
+        21:
+           uid: uvb-10-bmc
+           kind: other
+        22:
+           uid: uvb-9-bmc
+           kind: other
+        24:
+           uid: sw-2
+           kind: switch
+        26:
+          uid: swadmin-4
+          kind: switch
+          rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/swadmin-4.yaml b/input/grid5000/sites/sophia/networks/swadmin-4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1d17abe0fc9980277a04521a94aa8a3c9cce853b
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-4.yaml
@@ -0,0 +1,48 @@
+---
+swadmin-4:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.225
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        1:
+          uid: mercantour2-4-bmc
+          kind: other
+        2:
+          uid: mercantour2-3-bmc
+          kind: other
+        3:
+          uid: mercantour2-8-bmc
+          kind: other
+        4:
+          uid: mercantour2-7-bmc
+          kind: other
+        5:
+          uid: musa-5-bmc
+          kind: other
+        21:
+          uid: mercantour6-1-bmc
+          kind: other
+        22:
+          uid: mercantour2-6-bmc
+          kind: other
+        23:
+          uid: mercantour2-1-bmc
+          kind: other
+        24:
+          uid: mercantour2-2-bmc
+          kind: other
+        25:
+          uid: swadmin-3
+          kind: switch
+          rate: 10000000000
+
diff --git a/input/grid5000/sites/sophia/networks/swadmin-5.yaml b/input/grid5000/sites/sophia/networks/swadmin-5.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d99ee57173e43412d4e294814c532581c3859cf7
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-5.yaml
@@ -0,0 +1,20 @@
+---
+swadmin-5:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.223
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        25:
+          uid: sw-2
+          kind: switch
+          rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/swadmin-6.yaml b/input/grid5000/sites/sophia/networks/swadmin-6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7f02aff3c3010e625de23e3bc9b080f03c5348f2
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-6.yaml
@@ -0,0 +1,41 @@
+---
+swadmin-6:
+  model: Aruba 2930F
+  warranty: 2029-11
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.221
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        1:
+          uid: esterel1-1-bmc
+          kind: other
+        2:
+          uid: esterel5-1-bmc
+          kind: other
+        3:
+          uid: esterel5-2-bmc
+          kind: other
+        4:
+          uid: esterel6-1-bmc
+          kind: other
+        5:
+          uid: esterel7-1-bmc
+          kind: other
+        6:
+          uid: esterel7-2-bmc
+          kind: other
+        7:
+          uid: esterel27-1-bmc
+          kind: other
+        25:
+          uid: sw-6
+          kind: switch
+          rate: 10000000000
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 42d54af414e9f5df21678c87e6b5b1500d2401f0..08aa8f2283fd508b07946ba98e1a6997b9ebab92 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -71,6 +71,9 @@ vlans:
       local grenoble servan eth0 0 0 4 0
       local grenoble servan fpga0 0 0 4 10
       local grenoble servan fpga1 0 0 4 20
+      local grenoble kinovis eth0 0 0 5 0
+      local grenoble kinovis eth1 0 0 5 10
+      local grenoble kinovis eth2 0 0 5 20
       local lille chifflot eth0 0 0 4 0
       local lille chifflot eth1 0 0 5 0
       local lille chiclet eth0 0 0 6 0
@@ -216,8 +219,13 @@ vlans:
       global grenoble servan fpga0 0 0 35 10
       global grenoble servan fpga1 0 0 35 20
       global rennes paradoxe eth0 0 0 36 0
-      global sophia uvb eth0 0 0 40 0
-      global sophia musa eth0 0 0 39 0
+      global sophia mercantour1 eth0 0 0 37 0
+      global sophia mercantour2 eth0 0 0 37 16
+      global sophia mercantour3 eth0 0 0 37 24
+      global sophia mercantour4 eth0 0 0 37 40
+      global sophia mercantour5 eth0 0 0 37 41
+      global sophia mercantour6 eth0 0 0 37 45
+      global sophia mercantour7 eth0 0 0 37 46
       global sophia esterel1 eth0 0 0 38 0
       global sophia esterel2 eth0 0 0 38 1
       global sophia esterel3 eth0 0 0 38 2
@@ -259,13 +267,8 @@ vlans:
       global sophia esterel39 eth0 0 0 38 52
       global sophia esterel40 eth0 0 0 38 53
       global sophia esterel41 eth0 0 0 38 55
-      global sophia mercantour1 eth0 0 0 37 0
-      global sophia mercantour2 eth0 0 0 37 16
-      global sophia mercantour3 eth0 0 0 37 24
-      global sophia mercantour4 eth0 0 0 37 40
-      global sophia mercantour5 eth0 0 0 37 41
-      global sophia mercantour6 eth0 0 0 37 45
-      global sophia mercantour7 eth0 0 0 37 46
+      global sophia musa eth0 0 0 39 0
+      global sophia uvb eth0 0 0 40 0
       global nancy gruss eth2 0 0 41 0
       global luxembourg petitprince eth0 0 0 46 0
       global luxembourg petitprince eth1 0 0 46 100
@@ -284,6 +287,9 @@ vlans:
       global rennes roazhon7 eth0 0 0 53 10
       global rennes roazhon8 eth0 0 0 53 20
       global rennes roazhon9 eth0 0 0 53 30
+      global grenoble kinovis eth0 0 0 54 0
+      global grenoble kinovis eth1 0 0 54 10
+      global grenoble kinovis eth2 0 0 54 20
       routed grenoble yeti eth0 0 4 0 0
       routed grenoble dahu eth0 0 4 1 0
       routed grenoble troll eth0 0 4 2 0
@@ -291,6 +297,9 @@ vlans:
       routed grenoble servan eth0 0 4 4 0
       routed grenoble servan fpga0 0 4 4 10
       routed grenoble servan fpga1 0 4 4 20
+      routed grenoble kinovis eth0 0 4 5 0
+      routed grenoble kinovis eth1 0 4 5 10
+      routed grenoble kinovis eth2 0 4 5 20
       routed lille chifflot eth0 0 8 4 0
       routed lille chifflot eth1 0 8 5 0
       routed lille chiclet eth0 0 8 6 0
diff --git a/lib/refrepo/data_loader.rb b/lib/refrepo/data_loader.rb
index ed19e5ea02463b4eaf45e4ce9f909b35e995d09b..0b56bb4ce9b54ed425251abe683d781808225629 100644
--- a/lib/refrepo/data_loader.rb
+++ b/lib/refrepo/data_loader.rb
@@ -12,7 +12,7 @@ def load_data_hierarchy
     # Recursively list the .yaml files.
     # The order in which the results are returned depends on the system (http://ruby-doc.org/core-2.2.3/Dir.html).
     # => List deepest files first as they have lowest priority when hash keys are duplicated.
-    list_of_files = Dir['**/*.json'].sort_by { |x| -x.count('/') }
+    list_of_files = Dir['**/*.json'].sort_by { |x| [-x.count('/'), x] }
 
     list_of_files.each do |filename|
       # Load JSON
diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb
index 242b92695e8c3b0d523cc31c12b6ac0eee64b2c8..52b4077495ca5ae8b4d22aa02725cfce6118130c 100644
--- a/lib/refrepo/gen/reference-api.rb
+++ b/lib/refrepo/gen/reference-api.rb
@@ -15,6 +15,52 @@ def create_network_equipment(network_uid, network, refapi_path, site_uid = nil)
   write_json(network_path.join("#{network_uid}.json"), network)
 end
 
+def gen_node_description(node)
+  nb_cpu        = node['architecture']['nb_procs'].to_i
+  core_per_cpu  = node['architecture']['nb_cores'].to_i / nb_cpu
+  ram           = (node['main_memory']['ram_size'].to_i.to_f / (1024**3).to_f).round
+  pmem          = (node['main_memory']['pmem_size'].to_i.to_f / (1024**3).to_f).round if node['main_memory']['pmem_size']
+  proc_model    = node['processor']['model']
+  proc_version  = node['processor']['version']
+  if node.key?('gpu_devices')
+    nb_gpu       = node['gpu_devices'].length
+    gpu_model    = node['gpu_devices'].first[1]['model']
+  end
+  na            = {}
+  net_int       = node['network_adapters']
+  net_int.select {
+    |int| int['mountable']
+  }.each { |i|
+    if na.key?((i['rate'] / 1_000_000_000).to_s + 'Gb ' + i['interface'])
+      na[(i['rate'] / 1_000_000_000).to_s + 'Gb ' + i['interface']] += 1
+    else
+      na[(i['rate'] / 1_000_000_000).to_s + 'Gb ' + i['interface']] = 1
+    end
+  }
+  storages = {}
+  node['storage_devices'].each do |device|
+    unless device['storage'].nil?
+      storages[device['storage']].nil? ? storages[device['storage']] = [(device['size'].to_i / 1024**3).round] : storages[device['storage']] += [(device['size'].to_i / 1024**3).round]
+    end
+  end # each storage
+  cluster_storages = ''
+  storages.each do |t, s|
+    sizes = Hash.new(0)
+    s.each { |v| sizes.store(v, sizes[v]+1) }
+    sizes.each do |size, nb|
+      if nb > 1
+        cluster_storages += " #{nb}x#{size}GB #{t},"
+      else
+        cluster_storages += " #{size}GB #{t},"
+      end
+    end # each size
+  end # each storage
+  cluster_storages = cluster_storages[0..-2]
+  pmem_message = pmem ? ", #{pmem}GB PMEM" : ''
+  gpu_message  = nb_gpu ? ", #{nb_gpu} GPU#{nb_gpu > 1 ? "s" : ""} #{gpu_model}" : ''
+  return "#{nb_cpu} CPU#{(nb_cpu > 1) ? "s" : ""} #{proc_model} #{proc_version}, #{core_per_cpu} core#{(core_per_cpu > 1) ? "s" : ""}/CPU#{gpu_message}, #{ram}GB RAM#{pmem_message},#{cluster_storages}, #{na.map { |k,v| "#{v} x #{k}" }.join(', ') }"
+end
+
 def generate_reference_api
   # Output directory
   output_data_dir = "../../../data/grid5000/"
@@ -134,10 +180,6 @@ def generate_reference_api
         end
       end
 
-      # Write cluster info w/o nodes entries
-      write_json(cluster_path.join("#{cluster_uid}.json"),
-                 cluster.reject {|k, _v| k == "nodes"})
-
       #
       # Write node info
       #
@@ -165,6 +207,15 @@ def generate_reference_api
 
         write_json(cluster_path.join("nodes","#{node_uid}.json"), node)
       end
+
+      # Add nodes details to cluster description
+      cluster['nodes_count'] = cluster['nodes'].length
+      cluster['nodes_description'] = gen_node_description(cluster['nodes'].values.first)
+
+      # Write cluster info w/o nodes entries
+      write_json(cluster_path.join("#{cluster_uid}.json"),
+                 cluster.reject {|k, _v| k == "nodes"})
+
     end
 
   end
diff --git a/lib/refrepo/gpu_ref.rb b/lib/refrepo/gpu_ref.rb
index 035444e44ae0df4a55b7bd29543d9476f2548814..a1ca093e13977fd57aa501a4d7192b2970cd308d 100644
--- a/lib/refrepo/gpu_ref.rb
+++ b/lib/refrepo/gpu_ref.rb
@@ -20,6 +20,18 @@ class GPURef
         'fp-64' => 420000000000,
       },
     },
+    'GeForce GTX 1080' => {
+      'cores'              => 2560,
+      'compute_capability' => '6.1',
+      'short_name'         => 'GTX 1080',
+      'alias'              => 'gtx1080',
+      'microarchitecture'  => 'Pascal',
+      'performance'        => {
+        'fp-16' => 138600000000,
+        'fp-32' => 8872000000000,
+        'fp-64' => 277200000000,
+      },
+    },
     'GeForce GTX 1080 Ti' => {
       'cores'              => 3584,
       'compute_capability' => '6.1',
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 7e173f3623933e6973f886b6fbdc78f54d8e3b62..dd35c9ed3f36a0732efba28f2959700eb75d6e6e 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -227,6 +227,11 @@ kinovis:
 mercantour2:
   enp1s0f0np0: eth0
   eno2: eth1
+mercantour6:
+  enp1s0f0np0: eth0
+  eno1: eth0
+  eno2: eth1
+  ibp65s0: ib0
 montcalm:
   ens10f0np0: eth0
   ens10f1np1: eth1
@@ -368,6 +373,12 @@ vianden:
   eno8303: eth4
   eno8403: eth5
   enp158s0np0: eth6
+esterel5:
+  eno1: eth0
+  eno2: eth1
+  enp1s0f0np0: eth0
+  enp1s0f1: eth1
+  ibp130s0: ib0
 esterel10:
   eno1: eth0
   eno2: eth1
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index 7bec915ae91a44eaacfaf3a8cda266bbdc74a1ab..151cc130d95ee117a47b4566e55db954f19d7cc4 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -420,6 +420,8 @@ rennes:
     - ~storage_devices.pci-0000:64:00.0-scsi-0:2:3:0.model
     - ~storage_devices.pci-0000:64:00.0-scsi-0:2:3:0.firmware_version
 sophia:
+  esterel5-2: # different IB firmware version
+    - ~network_adapters.ib0.firmware_version
   esterel10-3: # 3 GPUs instead of 4
     - -gpu_devices.nvidia3
     - ~gpu_devices.nvidia1.cpu_affinity