From d80e85f5ad55052188627b749f92d4004029508e Mon Sep 17 00:00:00 2001
From: Guillaume Ranquet <guillaume.ranquet@inria.fr>
Date: Thu, 8 Jul 2010 15:59:23 +0200
Subject: [PATCH] [Bordeaux] Updating production environment name on all
 clusters

---
 .../clusters/bordeplage/nodes/bordeplage-1.json      |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-10.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-11.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-12.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-13.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-14.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-15.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-16.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-17.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-18.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-19.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-2.json      |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-20.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-21.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-22.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-23.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-24.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-25.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-26.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-27.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-28.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-29.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-3.json      |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-30.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-31.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-32.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-33.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-34.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-35.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-36.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-37.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-38.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-39.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-4.json      |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-40.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-41.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-42.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-43.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-44.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-45.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-46.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-47.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-48.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-49.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-5.json      |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-50.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-51.json     |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-6.json      |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-7.json      |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-8.json      |  2 +-
 .../clusters/bordeplage/nodes/bordeplage-9.json      |  2 +-
 .../clusters/bordereau/nodes/bordereau-1.json        |  2 +-
 .../clusters/bordereau/nodes/bordereau-10.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-11.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-12.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-13.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-14.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-15.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-16.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-17.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-18.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-19.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-2.json        |  2 +-
 .../clusters/bordereau/nodes/bordereau-20.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-21.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-22.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-23.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-24.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-25.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-26.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-27.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-28.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-29.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-3.json        |  2 +-
 .../clusters/bordereau/nodes/bordereau-30.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-31.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-32.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-33.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-34.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-35.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-36.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-37.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-38.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-39.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-4.json        |  2 +-
 .../clusters/bordereau/nodes/bordereau-40.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-41.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-42.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-43.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-44.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-45.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-46.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-47.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-48.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-49.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-5.json        |  2 +-
 .../clusters/bordereau/nodes/bordereau-50.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-51.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-52.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-53.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-54.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-55.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-56.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-57.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-58.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-59.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-6.json        |  2 +-
 .../clusters/bordereau/nodes/bordereau-60.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-61.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-62.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-63.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-64.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-65.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-66.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-67.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-68.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-69.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-7.json        |  2 +-
 .../clusters/bordereau/nodes/bordereau-70.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-71.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-72.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-73.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-74.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-75.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-76.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-77.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-78.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-79.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-8.json        |  2 +-
 .../clusters/bordereau/nodes/bordereau-80.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-81.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-82.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-83.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-84.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-85.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-86.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-87.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-88.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-89.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-9.json        |  2 +-
 .../clusters/bordereau/nodes/bordereau-90.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-91.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-92.json       |  2 +-
 .../clusters/bordereau/nodes/bordereau-93.json       |  2 +-
 generators/input/bordeaux.rb                         | 12 ++++++------
 145 files changed, 150 insertions(+), 150 deletions(-)

diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
index c3bccc9f97b..013b97a6895 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
index 8b315be8000..c627914bc29 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
index 6a9a70bdda9..767aca56600 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
index 09c9d3a9590..5992b1ccfba 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
index 14b51ce92a9..bb5990ac079 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
index 71f54522964..dff13497a73 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
index 9bd4ab75b8b..f54f6beb6e5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
index 13348fac2d0..0306e6df46f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
index 4497b2ae043..27ff969811c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
index 137fe109f49..55a9d7d8e20 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
index 33e51be38c0..763598473c3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
index 9638a73d54a..d5f661d33f5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
index 4885d3f490e..7c41ce51f4c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
index bad8f091e98..94efde3afe2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
index 7631687424b..d6769111298 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
index b972ce68e9e..76bfc33b6f2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
index 87a6272e5d4..56179c1b236 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
index a896f4d88e6..ed8552d7666 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
index d44bcb30470..06861b871ae 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
index 5c06e15918f..51437c0430f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
index 847296bc0c1..84750559911 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
index 0055cca2379..1d67ecc00d3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
index 9d4256cb217..61883904d73 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
index ff2188852ce..8e1d46a280d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
index e887fffe9ec..faf33ef082f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
index c31f61a2b05..1d257919431 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
index 91e1a3dc070..b363cd4d325 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
index 82d44135bc6..fb1c415be68 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
index a0feeb7d82d..a540d43d4ce 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
index e2a9f0084ce..ae65b3fa063 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
index 6e27a92c175..1de40c30b71 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
index 2ec4a80282c..41e95742fa4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
index 86fa29a1a33..d99bd9ce397 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
index e2a4554917c..cbc31913eb9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
index 890847ebdb1..e564319f488 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
index b48e202da90..0fe809b1ea2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
index 5c0e1341e70..9cb46b2edf6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
index bef00d2bf5c..a4bc4327b29 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
index 1f6b0a2c1d3..a6b7608ef0b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
index ec4e3db982b..9254ce396b0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
index 1bba439a061..576a7b1e085 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
index eb49ada66f0..29288e342bb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
index 6665c029f1a..6c23c3e3ae7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
index cad27526a49..cc47985c991 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
index a15f85c12d8..e2412f60715 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
index 99a77ed978a..4697ec5cda8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
index 335696aace2..e176c325f2f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
index 5adb9881d8c..b127402e5d2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
index 81a6ca92434..6d5d0c0f5d5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
index c2a6cdd5870..ba2e08382b9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
index 695309457b2..501eda83435 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
@@ -35,7 +35,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
index 970782daaf2..14ef6577f57 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
index 84d6fc7c3dd..0ae8fd86589 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
index d7f28ffbb81..a59e8eb02c7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
index 672a91210c9..c5d2d522d7e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
index e222ee7e4d6..b81bd598b42 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
index 6202892f396..eab1891864e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
index 16e34eeca53..1f874c84f78 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
index af05246698b..d72001f16a7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
index a68c693e3bf..3bff231c8bd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
index b725b5dbc8e..8e2b59203dc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
index 778146f928d..7506760a7e1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
index e2fec93cff8..765fecc2408 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
index d58981aacf1..9019f28976d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
index a8fb379da78..5dd43817769 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
index 2a946308d04..7ee4ad822b4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
index 2acfdd0c502..00aa90d2f38 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
index f302f2fde07..d31fb68c4b6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
index f3bdfa8b55b..115d02494f6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
index 3b32f226368..b2e06357e3a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
index a9abb301e68..1de2e9994de 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
index 179d94e816b..323305d012e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
index c235902ac52..7e3e1bece64 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
index e7860f168c1..c58d45e8e9d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
index f58eac869da..48470e3be3c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
index 4e347a2f88d..d2763a37e70 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
index 744c0a58053..523a73256ab 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
index f4065384106..5edb6e77948 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
index 752534ceaaf..125548e5aa8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
index 2c1a43e2b72..c2a3159e5ae 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
index e864af3ad28..84a882f077b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
index 584304b5662..dd0b92fa757 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
index b1954272ece..b1477525144 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
index 49e5f11f09b..655757e1e31 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
index 491a87607de..e8cc2bdebbc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
index 658d482fd96..1d69d8e8d4d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
index 10ed20a3643..597e2610dee 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
index d86d87d7a80..c0acc7ce89a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
index d278e817ee3..606b700d3ce 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
index d05e7398471..c14ac539432 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
index 18552f9f341..539f0fb33a4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
index 9e37fd3710f..86c4ae85e90 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
index 449a75bb82f..4532c47b880 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
index ebfc05666a2..3f2766b6108 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
index 3d637f999ac..b9618669c60 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
index be295a8951e..5a998efa351 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
index e7089bd211d..eb744055dec 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
index 667905057cf..eac18c64bdf 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
index b8b37dc95f8..32b5cbbbe9c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
index 288ed231b3d..81d35b94c77 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
index 9c2f95067ac..956c4bbe40c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
index bad0e1dada9..452358037f2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
index 5dfd9c7dd5c..9dfe650b732 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
index 927ea38d4b0..94f5d7ad83e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
index 17322373d0e..dbfd58d7221 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
index 0dbac463349..577c732e47d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
index dcf75eade9c..e9756a159de 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
index 1a8deaa6234..c06942a0d1f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
index a6e23de1ae8..4c9f50eaf44 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
index e8377402219..5319c11e0c8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
index a17e4cb9472..a2e3e5fd437 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
index 037e1fc0add..e1b4ff6bccb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
index 484ee70bf98..91c0bf91f2d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
index 76daf01ddef..2be1f113b93 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
index 6033a7332c1..dd8c224021e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
index b03e2607d00..f15f3cb5c62 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
index 9614e35e7d2..9b99f73f9ab 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
index 26fd7df4efd..059f2f6a72a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
index 133076f1511..b005d3d866f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
index d6112135b58..553fb82a1e7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
index 7e6a6e07bff..b45bbedc466 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
index 343709a6d24..97cdf077e5b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
index a4ab15a5c20..6aeb670e609 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
index e5fefb40b91..3f39009a6f9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
index d926b5d94a4..ce28698bf51 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
index 380ae9907cc..48ba03ebc6b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
index 6879110852c..7ee1af55541 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
index a09be084045..7633d28d930 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
index 24c0277dd5d..df862566c68 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
index 924065dd6f4..a41fd8b4bb7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
index 9fca40e14eb..b49f449c4b8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
index a082bc341ec..c0ad0a9be61 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
index 3ebffef6b0a..4585a8a9a17 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
index 84343ab9663..47799a57200 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
index e545ce34b52..477b45b4b07 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
index d21810d70ce..776adb2eb9d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
index cafc5d75f7a..a08eaa044df 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
index 3c971339838..cbc0634a6d2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
index 046290aaf99..863f0b481b7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
index b8ff3868cf1..63ee74a5481 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
index 833180e046b..287afb9493e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
index 14a7a9d6739..7dcd93c0440 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
index 119dc5b3893..8e923b2cf03 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
index ef04bfece3a..d76377bc512 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
@@ -30,7 +30,7 @@
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-prod-bol",
+    "kadeploy_name": "debian-x64-5-prod",
     "kadeploy_version": "2",
     "name": "Debian Sid",
     "release": null,
diff --git a/generators/input/bordeaux.rb b/generators/input/bordeaux.rb
index e044c3d4c71..4b32e79d4f6 100755
--- a/generators/input/bordeaux.rb
+++ b/generators/input/bordeaux.rb
@@ -42,9 +42,9 @@ site :bordeaux do |site_uid|
           :virtual_size => nil
         })
         operating_system({
-	  :kadeploy_name => "debian-prod-bol",    
-          :kadeploy_version => "2",       
-          :name => "Debian Sid",
+	  :kadeploy_name => "debian-x64-5-prod",    
+          :kadeploy_version => "1",       
+          :name => "Debian Lenny",
           :release => nil,
           :version => nil
         })
@@ -93,9 +93,9 @@ site :bordeaux do |site_uid|
           :virtual_size => nil
         })
         operating_system({
-	  :kadeploy_name => "debian-prod-bol",
-          :kadeploy_version => "2",
-          :name => "Debian Sid",
+	  :kadeploy_name => "debian-x64-5-prod",
+          :kadeploy_version => "1",
+          :name => "Debian Lenny",
           :release => nil,
           :version => nil        
 	})
-- 
GitLab