diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
index 46a2553a4e80dcf0c644506d1933ee94f9339182..df3d2dd76b68999eeb9f24363edf59e7a6341e7f 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
@@ -13,7 +13,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:0d:60:14:a1:44",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
@@ -27,7 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.0.33",
-      "mac": null,
+      "mac": "00:0d:60:14:a1:45",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
index 484285c2c9ce5206db72d940ff37d80c936be33a..ff0ce58c61c16bf219f2a6a23a367925f77d8812 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
@@ -13,7 +13,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:0d:60:14:a2:02",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
@@ -27,7 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.0.48",
-      "mac": null,
+      "mac": "00:0d:60:14:a2:03",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
index 8763630037484774f71fea6a8ef391c47d6cdaaa..c42c7694f33e771007446c082512c4652339a3da 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
@@ -13,7 +13,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:0d:60:14:a3:64",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
@@ -27,7 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.0.5",
-      "mac": null,
+      "mac": "00:0d:60:14:a3:65",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
index 0982aec32654cbc5a18081670cbb57f6d5308d22..aec242ecb35cfaa0bf570c32c67a65a4ece6b151 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
@@ -13,7 +13,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:0d:60:14:a3:36",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
@@ -27,7 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.0.50",
-      "mac": null,
+      "mac": "00:0d:60:14:a3:37",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
index 3d8a326ced5553d2d22742824975b52ef95ca4e4..af51c3228bc59c13dceebb886db8b03a7c047aca 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
@@ -13,7 +13,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:0d:60:14:a3:5e",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
@@ -27,7 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.0.51",
-      "mac": null,
+      "mac": "00:0d:60:14:a3:5f",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
index e69358102e83c18ce22f69bdd2585cad48e8f34e..d7b6be8dd112b23765d48af4b191720f58b91ab7 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
@@ -13,7 +13,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:0d:60:14:a2:e2",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
@@ -27,7 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.0.56",
-      "mac": null,
+      "mac": "00:0d:60:14:a2:e3",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
index 8bf9ebba13bccb2ace4605e42d4188d7f782545f..4248af41f53f4800fa2d7250be8ae8aebfecbaad 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
@@ -13,7 +13,7 @@
       "driver": "tg3",
       "enabled": true,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:11:25:1e:79:18",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
@@ -27,7 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.0.9",
-      "mac": null,
+      "mac": "00:11:25:1e:79:19",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
index ced9cae7ba14aa3b9c1a9c6e64b6a3d5c1f32bd8..51416c2bd25f676ad3a6486d7482554223b95712 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
@@ -14,7 +14,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.1.102",
-      "mac": null,
+      "mac": "00:09:3d:12:65:7c",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
@@ -28,7 +28,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.1.2",
-      "mac": null,
+      "mac": "00:09:3d:12:65:7d",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
index f9b64efe383567c926c0949b00f09b53adfcc557..ac9d9f6e040b4fd43a566df8c57d0fa9a7423ba1 100755
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
@@ -14,7 +14,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.1.174",
-      "mac": null,
+      "mac": "00:09:3d:11:db:ab",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
@@ -28,7 +28,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "10.69.1.74",
-      "mac": null,
+      "mac": "00:09:3d:11:db:ac",
       "management": false,
       "model": "BCM5704",
       "mountable": true,
diff --git a/generators/input/lyon.yaml b/generators/input/lyon.yaml
index 261a7d5b1cbd0aa6c6dda270a682eaf5ea976739..193835c2c5abfab9a2648f76986244c6f9385ea5 100644
--- a/generators/input/lyon.yaml
+++ b/generators/input/lyon.yaml
@@ -1,3 +1,10 @@
+capricorne-9:
+  mac_eth0: 00:11:25:1e:79:18
+  ip_eth0: 
+  mac_eth1: 00:11:25:1e:79:19
+  ip_eth1: 10.69.0.9
+  ip_mgt: 10.69.136.9
+  mac_mgt: 00:11:25:91:44:a5
 capricorne-10:
   mac_eth0: 00:0d:60:14:a3:2c
   ip_eth0: ""
@@ -159,6 +166,13 @@ capricorne-32:
   ip_eth1: 10.69.0.32
   ip_mgt: 10.69.136.32
   mac_mgt: 00:09:6b:9e:40:16
+capricorne-33:
+  mac_eth0: 00:0d:60:14:a1:44
+  ip_eth0: ""
+  mac_eth1: 00:0d:60:14:a1:45 
+  ip_eth1: 10.69.0.33
+  ip_mgt: 10.69.136.33
+  mac_mgt: 
 capricorne-34:
   mac_eth0: 00:0d:60:14:a0:e6
   ip_eth0: ""
@@ -257,6 +271,13 @@ capricorne-47:
   ip_eth1: 10.69.0.47
   ip_mgt: 10.69.136.47
   mac_mgt: 00:11:25:91:45:67
+capricorne-48:
+  mac_eth0: 00:0d:60:14:a2:02
+  ip_eth0: 
+  mac_eth1: 00:0d:60:14:a2:03
+  ip_eth1: 10.69.0.48
+  ip_mgt: 10.69.136.48
+  mac_mgt: 00:11:25:91:44:5e
 capricorne-49:
   mac_eth0: 00:0d:60:14:a0:32
   ip_eth0: ""
@@ -271,6 +292,27 @@ capricorne-4:
   ip_eth1: 10.69.0.4
   ip_mgt: 10.69.136.4
   mac_mgt: 00:11:25:91:45:51
+capricorne-5:
+  mac_eth0: 00:0d:60:14:a3:64
+  ip_eth0: ""
+  mac_eth1: 00:0d:60:14:a3:65 
+  ip_eth1: 10.69.0.5
+  ip_mgt: 10.69.136.5
+  mac_mgt: 
+capricorne-50:
+  mac_eth0: 00:0d:60:14:a3:36
+  ip_eth0: ""
+  mac_eth1: 00:0d:60:14:a3:37 
+  ip_eth1: 10.69.0.50
+  ip_mgt: 10.69.136.50
+  mac_mgt: 
+capricorne-51:
+  mac_eth0: 00:0d:60:14:a3:5e
+  ip_eth0: ""
+  mac_eth1: 00:0d:60:14:a3:5f 
+  ip_eth1: 10.69.0.51
+  ip_mgt: 10.69.136.51
+  mac_mgt: 
 capricorne-52:
   mac_eth0: 00:0d:60:14:a3:0a
   ip_eth0: ""
@@ -299,6 +341,13 @@ capricorne-55:
   ip_eth1: 10.69.0.55
   ip_mgt: 10.69.136.55
   mac_mgt: 00:11:25:91:45:60
+capricorne-56:
+  mac_eth0: 00:0d:60:14:a2:e2
+  ip_eth0: ""
+  mac_eth1: 00:0d:60:14:a2:e3 
+  ip_eth1: 10.69.0.56
+  ip_mgt: 10.69.136.56
+  mac_mgt: 
 capricorne-6:
   mac_eth0: 00:0d:60:14:a1:58
   ip_eth0: ""
@@ -453,6 +502,13 @@ sagittaire-29:
   ip_eth1: 10.69.1.29
   ip_mgt: 10.69.137.29
   mac_mgt: 00:09:3d:11:ea:00
+sagittaire-2:
+  mac_eth0: 00:09:3d:12:65:7c
+  ip_eth0: 10.69.1.102
+  mac_eth1: 00:09:3d:12:65:7d
+  ip_eth1: 10.69.1.2
+  ip_mgt: 10.69.137.2
+  mac_mgt: 00:09:3d:12:65:7e
 sagittaire-30:
   mac_eth0: 00:09:3d:12:7c:93
   ip_eth0: 10.69.1.130
@@ -733,6 +789,13 @@ sagittaire-72:
   ip_eth1: 10.69.1.72
   ip_mgt: 10.69.137.72
   mac_mgt: 00:09:3d:11:ae:fe
+sagittaire-74:
+  mac_eth0: 00:09:3d:11:db:ab
+  ip_eth0: 10.69.1.174
+  mac_eth1: 00:09:3d:11:db:ac
+  ip_eth1: 10.69.1.74
+  ip_mgt: 10.69.137.74
+  mac_mgt: 00:09:3d:11:db:ad
 sagittaire-77:
   mac_eth0: 00:09:3d:11:c5:2b
   ip_eth0: 10.69.1.177