diff --git a/ubuntu-14.04/configs/cloud/cloud.cfg b/ubuntu-14.04/configs/cloud/cloud.cfg
new file mode 100644
index 0000000..3de7043
--- /dev/null
+++ b/ubuntu-14.04/configs/cloud/cloud.cfg
@@ -0,0 +1,64 @@
+users:
+   - default
+
+# If this is set, 'root' will not be able to ssh in and they
+# will get a message to login instead as the above $user (ubuntu)
+disable_root: true
+
+# This will cause the set+update hostname module to not operate (if true)
+preserve_hostname: false
+manage_etc_hosts: localhost
+
+# The modules that run in the 'init' stage
+cloud_init_modules:
+ - migrator
+ - seed_random
+ - bootcmd
+ - write-files
+ - growpart
+ - resizefs
+ - set_hostname
+ - update_hostname
+ - update_etc_hosts
+ - ca-certs
+ - rsyslog
+ - users-groups
+ - ssh
+
+# The modules that run in the 'config' stage
+cloud_config_modules:
+# Emit the cloud config ready event
+# this can be used by upstart jobs for 'start on cloud-config'.
+ - emit_upstart
+ - disk_setup
+ - mounts
+ - ssh-import-id
+ - locale
+ - set-passwords
+ - grub-dpkg
+ - apt-pipelining
+ - apt-configure
+ - package-update-upgrade-install
+ - landscape
+ - timezone
+ - puppet
+ - chef
+ - salt-minion
+ - mcollective
+ - disable-ec2-metadata
+ - runcmd
+ - byobu
+
+# The modules that run in the 'final' stage
+cloud_final_modules:
+ - rightscale_userdata
+ - scripts-vendor
+ - scripts-per-once
+ - scripts-per-boot
+ - scripts-per-instance
+ - scripts-user
+ - ssh-authkey-fingerprints
+ - keys-to-console
+ - phone-home
+ - final-message
+ - power-state-change
diff --git a/ubuntu-14.04/http/preseed-lvm.cfg b/ubuntu-14.04/http/preseed-lvm.cfg
index 690b7d0..528a577 100644
--- a/ubuntu-14.04/http/preseed-lvm.cfg
+++ b/ubuntu-14.04/http/preseed-lvm.cfg
@@ -1,7 +1,6 @@
 d-i apt-setup/use_mirror boolean false
 d-i apt-setup/local0/repository string [arch=amd64] http://apt.cloudlab.cz/nightly trusty main cloudlab security
 d-i apt-setup/local0/key string http://apt.cloudlab.cz/public.gpg
-d-i preseed/late_command string sed -i '/.*security\.ubuntu.com.*/d' /etc/apt/sources.list
 
 d-i debian-installer/framebuffer boolean false
 d-i debconf/frontend select noninteractive
diff --git a/ubuntu-14.04/http/preseed.cfg b/ubuntu-14.04/http/preseed.cfg
index 4a82241..adb5924 100644
--- a/ubuntu-14.04/http/preseed.cfg
+++ b/ubuntu-14.04/http/preseed.cfg
@@ -1,7 +1,6 @@
 d-i apt-setup/use_mirror boolean false
 d-i apt-setup/local0/repository string [arch=amd64] http://apt.cloudlab.cz/nightly trusty main cloudlab security
 d-i apt-setup/local0/key string http://apt.cloudlab.cz/public.gpg
-d-i preseed/late_command string sed -i '/.*security\.ubuntu.com.*/d' /etc/apt/sources.list
 
 d-i debian-installer/framebuffer boolean false
 d-i debconf/frontend select noninteractive
diff --git a/ubuntu-14.04/scripts/base.sh b/ubuntu-14.04/scripts/base.sh
index 43e6360..fc9b77e 100644
--- a/ubuntu-14.04/scripts/base.sh
+++ b/ubuntu-14.04/scripts/base.sh
@@ -1,4 +1,7 @@
-# base packages and setup
+## Base packages and setup
+# Remove unwanted ubuntu security repository
+sed -i '/.*security\.ubuntu.com.*/d' /etc/apt/sources.list
+
 apt-get update
 apt-get -y upgrade
 apt-get -y dist-upgrade
diff --git a/ubuntu-14.04/template.json b/ubuntu-14.04/template.json
index 2f0dccb..b972468 100644
--- a/ubuntu-14.04/template.json
+++ b/ubuntu-14.04/template.json
@@ -52,6 +52,11 @@
       "type": "file",
       "source": "configs/cloud/cloud.cfg.d/99_tcp.cfg",
       "destination": "/etc/cloud/cloud.cfg.d/99_tcp.cfg"
+    },
+    {
+      "type": "file",
+      "source": "configs/cloud/cloud.cfg",
+      "destination": "/etc/cloud/cloud.cfg"
     }
   ],
   "post-processors": [