diff --git a/data/grid5000/sites/grenoble/servers/puppet.json b/data/grid5000/sites/grenoble/servers/puppet6.json
similarity index 75%
rename from data/grid5000/sites/grenoble/servers/puppet.json
rename to data/grid5000/sites/grenoble/servers/puppet6.json
index a7fb0be4bea0925d728c8a1f1bc9df1c6f13f82b..1e860f867c92caa9763a8943dce61ffba78cc86f 100644
--- a/data/grid5000/sites/grenoble/servers/puppet.json
+++ b/data/grid5000/sites/grenoble/servers/puppet6.json
@@ -1,4 +1,5 @@
 {
+  "alias": "puppet",
   "kind": "virtual",
   "network_adapters": {
     "default": {
@@ -6,5 +7,5 @@
     }
   },
   "type": "server",
-  "uid": "puppet"
+  "uid": "puppet6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/servers/puppet.json b/data/grid5000/sites/lille/servers/puppet6.json
similarity index 81%
rename from data/grid5000/sites/lille/servers/puppet.json
rename to data/grid5000/sites/lille/servers/puppet6.json
index 4f2162abd761a0ba26d51a53ea394400cb258117..ba56c3774a8989c84c87c96e7b5337b03adc0ff8 100644
--- a/data/grid5000/sites/lille/servers/puppet.json
+++ b/data/grid5000/sites/lille/servers/puppet6.json
@@ -1,4 +1,5 @@
 {
+  "alias": "puppet",
   "kind": "virtual",
   "network_adapters": {
     "adm": {
@@ -9,5 +10,5 @@
     }
   },
   "type": "server",
-  "uid": "puppet"
+  "uid": "puppet6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/servers/puppet.json b/data/grid5000/sites/luxembourg/servers/puppet6.json
similarity index 75%
rename from data/grid5000/sites/luxembourg/servers/puppet.json
rename to data/grid5000/sites/luxembourg/servers/puppet6.json
index 46831fe149efcda4216c3691e3612ffa572d04eb..5b55d8171fad4ad7f55b524c5077063adf6de018 100644
--- a/data/grid5000/sites/luxembourg/servers/puppet.json
+++ b/data/grid5000/sites/luxembourg/servers/puppet6.json
@@ -1,4 +1,5 @@
 {
+  "alias": "puppet",
   "kind": "virtual",
   "network_adapters": {
     "default": {
@@ -6,5 +7,5 @@
     }
   },
   "type": "server",
-  "uid": "puppet"
+  "uid": "puppet6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/servers/puppet.json b/data/grid5000/sites/lyon/servers/puppet6.json
similarity index 75%
rename from data/grid5000/sites/lyon/servers/puppet.json
rename to data/grid5000/sites/lyon/servers/puppet6.json
index 59473844727c506881d6b074d5b40f7863b0e05f..198f165b1574e98a561cb13b1ddd08d8606bc43f 100644
--- a/data/grid5000/sites/lyon/servers/puppet.json
+++ b/data/grid5000/sites/lyon/servers/puppet6.json
@@ -1,4 +1,5 @@
 {
+  "alias": "puppet",
   "kind": "virtual",
   "network_adapters": {
     "default": {
@@ -6,5 +7,5 @@
     }
   },
   "type": "server",
-  "uid": "puppet"
+  "uid": "puppet6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/puppet.json b/data/grid5000/sites/nancy/servers/puppet6.json
similarity index 75%
rename from data/grid5000/sites/nancy/servers/puppet.json
rename to data/grid5000/sites/nancy/servers/puppet6.json
index ae4c344a39b16acc20f8e997e69c71ac576ebb07..80276ebcf9948d3e53bd1eafafa6c118314ccdcb 100644
--- a/data/grid5000/sites/nancy/servers/puppet.json
+++ b/data/grid5000/sites/nancy/servers/puppet6.json
@@ -1,4 +1,5 @@
 {
+  "alias": "puppet",
   "kind": "virtual",
   "network_adapters": {
     "default": {
@@ -6,5 +7,5 @@
     }
   },
   "type": "server",
-  "uid": "puppet"
+  "uid": "puppet6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/puppet.json b/data/grid5000/sites/nantes/servers/puppet6.json
similarity index 75%
rename from data/grid5000/sites/nantes/servers/puppet.json
rename to data/grid5000/sites/nantes/servers/puppet6.json
index ae4c7ab990e992165d0ac484dcda57ed496bb6db..02f941c058f526f5cfe6a99eb9ddfbf062b6f814 100644
--- a/data/grid5000/sites/nantes/servers/puppet.json
+++ b/data/grid5000/sites/nantes/servers/puppet6.json
@@ -1,4 +1,5 @@
 {
+  "alias": "puppet",
   "kind": "virtual",
   "network_adapters": {
     "default": {
@@ -6,5 +7,5 @@
     }
   },
   "type": "server",
-  "uid": "puppet"
+  "uid": "puppet6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/servers/puppet.json b/data/grid5000/sites/sophia/servers/puppet6.json
similarity index 81%
rename from data/grid5000/sites/sophia/servers/puppet.json
rename to data/grid5000/sites/sophia/servers/puppet6.json
index cf45e1f2e3872dff7c21c8b17dce969b602f9778..5d85b1e0ba5ea971a32dd4f167db7d52d5f740be 100644
--- a/data/grid5000/sites/sophia/servers/puppet.json
+++ b/data/grid5000/sites/sophia/servers/puppet6.json
@@ -1,4 +1,5 @@
 {
+  "alias": "puppet",
   "kind": "virtual",
   "network_adapters": {
     "admin": {
@@ -9,5 +10,5 @@
     }
   },
   "type": "server",
-  "uid": "puppet"
+  "uid": "puppet6"
 }
\ No newline at end of file