diff --git a/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg b/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
index cbc22c3..bfaa1fe 100644
--- a/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
+++ b/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
@@ -19,19 +19,5 @@
       cloud_dir: /var/lib/cloud/
       templates_dir: /etc/cloud/templates/
       upstart_dir: /etc/init/
-   package_mirrors:
-     - arches: [i386, amd64]
-       failsafe:
-         primary: http://archive.ubuntu.com/ubuntu
-         security: http://security.ubuntu.com/ubuntu
-       search:
-         primary:
-           - http://eu.archive.ubuntu.com/ubuntu/
-           - http://us.archive.ubuntu.com/ubuntu/
-         security: []
-     - arches: [armhf, armel, default]
-       failsafe:
-         primary: http://ports.ubuntu.com/ubuntu-ports
-         security: http://ports.ubuntu.com/ubuntu-ports
    ssh_svcname: ssh
 
diff --git a/ubuntu-14.04/http/preseed-lvm.cfg b/ubuntu-14.04/http/preseed-lvm.cfg
index c0863a2..528a577 100644
--- a/ubuntu-14.04/http/preseed-lvm.cfg
+++ b/ubuntu-14.04/http/preseed-lvm.cfg
@@ -1,4 +1,7 @@
-choose-mirror-bin mirror/http/proxy string
+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 debian-installer/framebuffer boolean false
 d-i debconf/frontend select noninteractive
 d-i base-installer/kernel/override-image string linux-server
@@ -25,19 +28,21 @@
 
 d-i partman-auto/expert_recipe string                         \
       boot-root ::                                            \
-              64 128 128 ext3                                 \
+              64 128 128 ext4                                 \
                       $primary{ } $bootable{ }                \
                       method{ format } format{ }              \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ /boot }                     \
+                      options/noatime{ noatime }              \
               .                                               \
               128 512 200% linux-swap                         \
                       method{ swap } format{ }                \
               .                                               \
-              512 512 512 ext3                                \
+              512 512 512 ext4                                \
                       method{ format } format{ } $lvmok{ }    \
                       use_filesystem{ } filesystem{ ext4 }    \
                       mountpoint{ / }                         \
+                      options/noatime{ noatime }              \
               .                                               \
 
 d-i partman/default_filesystem string ext4
diff --git a/ubuntu-14.04/http/preseed.cfg b/ubuntu-14.04/http/preseed.cfg
index 06c2ddd..adb5924 100644
--- a/ubuntu-14.04/http/preseed.cfg
+++ b/ubuntu-14.04/http/preseed.cfg
@@ -1,4 +1,7 @@
-choose-mirror-bin mirror/http/proxy string
+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 debian-installer/framebuffer boolean false
 d-i debconf/frontend select noninteractive
 d-i base-installer/kernel/override-image string linux-server
diff --git a/ubuntu-14.04/scripts/base.sh b/ubuntu-14.04/scripts/base.sh
index 07114ad..43e6360 100644
--- a/ubuntu-14.04/scripts/base.sh
+++ b/ubuntu-14.04/scripts/base.sh
@@ -4,7 +4,14 @@
 apt-get -y dist-upgrade
 
 # Useful tools
-apt-get -y install curl tmux vim-nox byobu
+apt-get -y install curl tmux vim-nox byobu iputils-ping traceroute htop
+
+# Tmux fixes
+cat << 'EOF' >> /etc/tmux.conf
+set -g default-terminal "screen-256color"
+set -g set-titles on
+set -g xterm-keys on
+EOF
 
 # Cleanup old kernels, ensure latest is installed via virtual package
 apt-get purge -y linux-image-* linux-headers-*
diff --git a/ubuntu-14.04/scripts/salt.sh b/ubuntu-14.04/scripts/salt.sh
index cfdb2f9..ceec857 100644
--- a/ubuntu-14.04/scripts/salt.sh
+++ b/ubuntu-14.04/scripts/salt.sh
@@ -1,5 +1 @@
-#!/bin/sh
-curl -L https://bootstrap.saltstack.com | sudo sh -s --
-curl -k -L https://bootstrap.saltstack.com | sudo sh -s --
-rm -f /tmp/install_salt.sh
-
+apt-get -y install salt-minion reclass
diff --git a/ubuntu-14.04/template.json b/ubuntu-14.04/template.json
index a918047..2f0dccb 100644
--- a/ubuntu-14.04/template.json
+++ b/ubuntu-14.04/template.json
@@ -4,7 +4,7 @@
         "password": "{{ env `BUILD_PASSWORD` }}",
 	"do_api_token": "{{ env `DO_API_TOKEN` }}",
 	"distro": "ubuntu-14-04-x64",
-        "disk_size": 8000 
+        "disk_size": "8000"
    },
 
   "provisioners": [
@@ -189,6 +189,7 @@
       "ssh_password": "{{user `password`}}",
       "shutdown_command": "echo '{{user `password`}}'|sudo -S shutdown -P now",
       "boot_wait": "2s",
+      "ssh_wait_timeout": "10000s",
       "boot_command": [
         "<esc><wait>",
         "<esc><wait>",