diff --git a/data/grid5000/sites/luxembourg/servers/cronos.json b/data/grid5000/sites/luxembourg/servers/cronos.json
index 7c58ad4700f947811f664db2dc624d8529eac345..a7cb3215aa75c613b43339dd71bf34ae27527258 100644
--- a/data/grid5000/sites/luxembourg/servers/cronos.json
+++ b/data/grid5000/sites/luxembourg/servers/cronos.json
@@ -1,7 +1,6 @@
 {
   "alias": [
     "adminfront",
-    "ntp",
     "af",
     "granduc-srv",
     "smokeping"
diff --git a/data/grid5000/sites/luxembourg/servers/md1000.json b/data/grid5000/sites/luxembourg/servers/md1000.json
new file mode 100644
index 0000000000000000000000000000000000000000..a38e59203947b47fb7cb568d0a57a388d5401dbe
--- /dev/null
+++ b/data/grid5000/sites/luxembourg/servers/md1000.json
@@ -0,0 +1,12 @@
+{
+  "alias": [
+
+  ],
+  "kind": "storage",
+  "network_adapters": {
+  },
+  "serial": "6P90J2J",
+  "type": "server",
+  "uid": "md1000",
+  "warranty": 10.2009
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/servers/petitprince-cmc.json b/data/grid5000/sites/luxembourg/servers/petitprince-cmc.json
index b9377a88baa669ffec9dfdf09ec8f9eed0c59f88..5fa055f5e2d7e0569cdc0f6e1c6eb00a71205cee 100644
--- a/data/grid5000/sites/luxembourg/servers/petitprince-cmc.json
+++ b/data/grid5000/sites/luxembourg/servers/petitprince-cmc.json
@@ -2,7 +2,7 @@
   "alias": [
     "m1000-cmc"
   ],
-  "kind": "storage",
+  "kind": "physical",
   "network_adapters": {
     "bmc": {
       "ip": "172.17.177.254"
diff --git a/data/grid5000/sites/luxembourg/servers/zeus.json b/data/grid5000/sites/luxembourg/servers/zeus.json
index ef43e9889357c48eb744f4ad1b8df74e7e63f2c7..ea3f543202853419e267695993052199244869d3 100644
--- a/data/grid5000/sites/luxembourg/servers/zeus.json
+++ b/data/grid5000/sites/luxembourg/servers/zeus.json
@@ -1,6 +1,7 @@
 {
   "alias": [
     "nfs",
+    "ntp",
     "home-g5k",
     "public"
   ],
diff --git a/input/grid5000/sites/luxembourg/servers/servers.yaml b/input/grid5000/sites/luxembourg/servers/servers.yaml
index d238d111dbc5f73297ebc3d08bc1e207bdb89246..aa1ac2530939ee7a45b6e2a9273186789678f86e 100644
--- a/input/grid5000/sites/luxembourg/servers/servers.yaml
+++ b/input/grid5000/sites/luxembourg/servers/servers.yaml
@@ -1,6 +1,6 @@
 cronos:
   kind: physical
-  alias: [adminfront, ntp, af, granduc-srv, smokeping]
+  alias: [adminfront, af, granduc-srv, smokeping]
   warranty: 05.2017
   serial: JSG625J
   network_adapters:
@@ -13,7 +13,7 @@ cronos:
 
 zeus:
   kind: physical
-  alias: [nfs, home-g5k, public]
+  alias: [nfs, ntp, home-g5k, public]
   warranty: 08.2016
   serial: 8L6033J
   network_adapters:
@@ -36,10 +36,17 @@ hera:
       mac: 00:1C:23:D6:C4:E6
 
 petitprince-cmc:
-  kind: storage
+  kind: physical
   alias: [m1000-cmc]
   warranty: 10.2016
   serial: CDQTG5J
   network_adapters:
     bmc:
       ip: 172.17.177.254
+
+md1000:
+  kind: storage
+  alias: []
+  warranty: 10.2009
+  serial: 6P90J2J
+  network_adapters: {}