diff --git a/data/grid5000/environments/lenny-x64-base-2.3.json b/data/grid5000/environments/lenny-x64-base-2.3.json
index 71fa8fd925120fe87ce107ea583a9a3da515fe41..d951bfac6e495464fd869705a33510fa4e1fed09 100644
--- a/data/grid5000/environments/lenny-x64-base-2.3.json
+++ b/data/grid5000/environments/lenny-x64-base-2.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-base-2.3",
-  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-big-2.3.json b/data/grid5000/environments/lenny-x64-big-2.3.json
index 97e1b315f73ceebc436ab33fb47153d75577d094..e39770d029953e606efde4b089e2f594c4b63b29 100644
--- a/data/grid5000/environments/lenny-x64-big-2.3.json
+++ b/data/grid5000/environments/lenny-x64-big-2.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-big-2.3",
-  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-min-0.8.json b/data/grid5000/environments/lenny-x64-min-0.8.json
index a466fe89448e4b5ee3ce7d9361493e221f5beec1..5f5a7cf6e70b7cb5e8a85004143933dc6fbb84f1 100644
--- a/data/grid5000/environments/lenny-x64-min-0.8.json
+++ b/data/grid5000/environments/lenny-x64-min-0.8.json
@@ -29,6 +29,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-min-0.8",
-  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-nfs-2.3.json b/data/grid5000/environments/lenny-x64-nfs-2.3.json
index e64c5e49e751ae149500196f3f32d50d46900839..4a2f61200a33a01b00190ae76323f8a5b915991d 100644
--- a/data/grid5000/environments/lenny-x64-nfs-2.3.json
+++ b/data/grid5000/environments/lenny-x64-nfs-2.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-nfs-2.3",
-  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-xen-2.3.json b/data/grid5000/environments/lenny-x64-xen-2.3.json
index 3f8927b8d0760989ba118c2d6a557cd45a748e78..c1fa8b24c9130ce6c25be6aeb1984d7aa2251d80 100644
--- a/data/grid5000/environments/lenny-x64-xen-2.3.json
+++ b/data/grid5000/environments/lenny-x64-xen-2.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-xen-2.3",
-  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/generators/input/environments.rb b/generators/input/environments.rb
index b57899931090e8dc0f27baa3d3dadbc79d5a85e0..16be6de27f3819269fa5ad4d9dad039f3314844b 100755
--- a/generators/input/environments.rb
+++ b/generators/input/environments.rb
@@ -469,7 +469,7 @@ environment 'lenny-x64-base-2.3' do
   state "stable"
   file({:path => "/grid5000/images/lenny-x64-base-2.3.tgz", :md5 => "3c255364f601fc19271783269ef541c2"})
   kernel "2.6.26.2"
-  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
@@ -484,7 +484,7 @@ environment 'lenny-x64-big-2.3' do
   state "stable"
   file({:path => "/grid5000/images/lenny-x64-big-2.3.tgz", :md5 => "e5870c72c1a5386c287935dcf39a8a23"})
   kernel "2.6.26.2"
-  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
@@ -499,7 +499,7 @@ environment 'lenny-x64-min-0.8' do
   state "stable"
   file({:path => "/grid5000/images/lenny-x64-min-0.8.tgz", :md5 => "a39dcad30821b7404d8eb5ac1388f650"})
   kernel "2.6.26.2"
-  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
@@ -513,7 +513,7 @@ environment 'lenny-x64-nfs-2.3' do
   state "stable"
   file({:path => "/grid5000/images/lenny-x64-nfs-2.3.tgz", :md5 => "12522a436a2790df866f1ecd63680eff"})
   kernel "2.6.26.2"
-  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
@@ -528,7 +528,7 @@ environment 'lenny-x64-xen-2.3' do
   state "stable"
   file({:path => "/grid5000/images/lenny-x64-xen-2.3.tgz", :md5 => "8e4f0eff055c61ed8a51265c1c9afd58"})
   kernel "2.6.26.2"
-  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
diff --git a/generators/input/lille.rb b/generators/input/lille.rb
index d081edb64b623be1fed68e014f9b4ee90b8524eb..954fe7b5934bb8eb6643f4bb588be916def0628d 100755
--- a/generators/input/lille.rb
+++ b/generators/input/lille.rb
@@ -11,7 +11,8 @@ site :lille do |site_uid|
   user_support_contact
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
-    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  +
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   
   cluster :chicon do |cluster_uid|
     model "IBM eServer 326m"
diff --git a/generators/input/toulouse.rb b/generators/input/toulouse.rb
index ebe45b3577f4eb5a6748b4b5c951676d911fba94..0efc64b5d9c1e96e3d4953740c54f522d701a8ba 100755
--- a/generators/input/toulouse.rb
+++ b/generators/input/toulouse.rb
@@ -11,7 +11,8 @@ site :toulouse do |site_uid|
   user_support_contact
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1} +
-    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0}  +
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
 
   cluster :violette do |cluster_uid|
     model "Sun Fire V20z"