diff --git a/data/grid5000/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/environments/squeeze-x64-nfs-0.8.json
new file mode 100644
index 0000000000000000000000000000000000000000..a23eacbf8b6862b941ef7df2e58a63af83364968
--- /dev/null
+++ b/data/grid5000/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "49642989fa205b8f8e3366aaa149cf29",
+    "path": "/grid5000/images/squeeze-x64-nfs-0.8.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "squeeze-x64-nfs-0.8",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , 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/squeeze-x64-xen-0.8.json b/data/grid5000/environments/squeeze-x64-xen-0.8.json
new file mode 100644
index 0000000000000000000000000000000000000000..3d3cf2c6ab72c3f0ed408ce27d243f3eba056cb7
--- /dev/null
+++ b/data/grid5000/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "351284d43d4a3687b3198cbd1d34738f",
+    "path": "/grid5000/images/squeeze-x64-xen-0.8.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "squeeze-x64-xen-0.8",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , 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/generators/input/environments.rb b/generators/input/environments.rb
index d41ec9ef118c9a182bf342fee458ec2ea37b8ef7..ba005995f8bd28ea0ab20bdf1d4a061d69e939d1 100755
--- a/generators/input/environments.rb
+++ b/generators/input/environments.rb
@@ -583,7 +583,7 @@ environment 'squeeze-x64-min-0.8' do
   tcp_bandwidth 1.G
 end
 
-environment 'squeeze-x64-nfs-2.3' do
+environment 'squeeze-x64-nfs-0.8' do
   state "stable"
   file({:path => "/grid5000/images/squeeze-x64-nfs-0.8.tgz", :md5 => "49642989fa205b8f8e3366aaa149cf29"})
   kernel "2.6.26.2"
@@ -598,7 +598,7 @@ environment 'squeeze-x64-nfs-2.3' do
   tcp_bandwidth 1.G
 end
 
-environment 'squeeze-x64-xen-2.3' do
+environment 'squeeze-x64-xen-0.8' do
   state "stable"
   file({:path => "/grid5000/images/squeeze-x64-xen-0.8.tgz", :md5 => "351284d43d4a3687b3198cbd1d34738f"})
   kernel "2.6.26.2"