diff --git a/ubuntu-14.04/scripts/base.sh b/ubuntu-14.04/scripts/base.sh
index 841954f..18247c4 100644
--- a/ubuntu-14.04/scripts/base.sh
+++ b/ubuntu-14.04/scripts/base.sh
@@ -32,13 +32,3 @@
 
 # Setup cloud-init
 apt-get -y install cloud-init
-
-# Hack to be able to upload configuration
-# (because build is done under ubuntu user)
-chown -R root:ubuntu /etc/cloud
-chmod -R g+w /etc/cloud
-
-# to be removed
-#sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers
-#sed -i -e 's/%sudo  ALL=(ALL:ALL) ALL/%sudo  ALL=NOPASSWD:ALL/g' /etc/sudoers
-
diff --git a/ubuntu-14.04/template.json b/ubuntu-14.04/template.json
index d33a262..81c0580 100644
--- a/ubuntu-14.04/template.json
+++ b/ubuntu-14.04/template.json
@@ -85,9 +85,6 @@
         },
 	"qemu": {
 	  "output": "images/{{ user `distro` }}-qemu-{{ timestamp }}.box"
-	},
-	"qemu": {
-	  "output": "images/{{ user `distro` }}-qemu-{{ timestamp }}.box"
 	}
       },
       "except": [ "digitalocean", "docker" ]
@@ -97,6 +94,11 @@
       "repository": "cloudlab/ubuntu",
       "tag": "14.04",
       "only": ["docker"]
+    },
+    {
+      "type": "docker-save",
+      "path": "images/{{ user `distro` }}-docker-{{ timestamp }}.tar",
+      "only": ["docker"]
     }
   ],
   "builders": [