diff --git a/ubuntu-16.04/scripts/base.sh b/ubuntu-16.04/scripts/base.sh
new file mode 100644
index 0000000..babf3a8
--- /dev/null
+++ b/ubuntu-16.04/scripts/base.sh
@@ -0,0 +1,34 @@
+## Base packages and setup
+# Remove unwanted ubuntu security repository
+sed -i '/.*security\.ubuntu.com.*/d' /etc/apt/sources.list
+
+apt-get update
+
+# Cleanup old kernels, ensure latest is installed via virtual package
+apt-get purge -y linux-image-* linux-headers-*
+if [ ! -f /tmp/no_install_kernel ]; then
+    apt-get install -y linux-generic-lts-vivid
+
+    # Update grub cmdline
+    sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8"|g' /etc/default/grub
+    sed -i 's|GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"|g' /etc/default/grub
+    update-grub
+fi
+
+apt-get -y upgrade
+apt-get -y dist-upgrade
+
+apt-get autoremove --purge
+
+# Useful tools
+apt-get -y install curl wget 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
+
+# Setup cloud-init
+apt-get -y install cloud-init
diff --git a/ubuntu-16.04/scripts/cleanup.sh b/ubuntu-16.04/scripts/cleanup.sh
new file mode 100644
index 0000000..5a7d528
--- /dev/null
+++ b/ubuntu-16.04/scripts/cleanup.sh
@@ -0,0 +1,17 @@
+apt-get -y autoremove --purge
+apt-get -y clean
+
+echo "cleaning up guest additions"
+rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? || true
+
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp/* || true
+
+echo "cleaning up udev rules"
+rm -f /etc/udev/rules.d/70-persistent-net.rules || true
+rm -rf /dev/.udev/ || true
+rm -f /lib/udev/rules.d/75-persistent-net-generator.rules || true
+
+echo "cleaning up minion_id for salt"
+rm -f /etc/salt/minion_id || true
+
diff --git a/ubuntu-16.04/scripts/docker.sh b/ubuntu-16.04/scripts/docker.sh
new file mode 100644
index 0000000..ba1beeb
--- /dev/null
+++ b/ubuntu-16.04/scripts/docker.sh
@@ -0,0 +1,11 @@
+# This should simulate preseed behavior
+
+apt-get -y install curl
+
+echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly trusty main security extra tcp" >/etc/apt/sources.list
+curl -s http://apt.tcpcloud.eu/public.gpg | apt-key add -
+
+apt-get update
+
+# Kernel makes no sense in docker, let base.sh know
+touch /tmp/no_install_kernel
diff --git a/ubuntu-16.04/scripts/foreman.sh b/ubuntu-16.04/scripts/foreman.sh
new file mode 100644
index 0000000..648edd4
--- /dev/null
+++ b/ubuntu-16.04/scripts/foreman.sh
@@ -0,0 +1,6 @@
+# One-time key for Foreman provisioning
+
+[ ! -d ~/.ssh ] && mkdir -m 700 ~/.ssh
+cat << EOF >> ~/.ssh/authorized_keys
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDWc8adBL8rzHwG3k+OMxSa/7aQzKY2Mw1JtYfK3xgj7yigSw8kfPg1UV8ZOe2HPTArQnaqkinKO7c7Uq3OH6lsygousjTDkHWpsB607P0AQYcB9m+oo7UwJYEDRfrwyGLgR0yMy9aC2sUAgOsiylZLfCy7jF6lXChNkv6td6Co+EzVN5RyVc8tgB25wXPn1DSp33stzy/hBWgMuWRDObpzQvZlr2i0Ed87CdBLCCP3DGDGHv9jYCxPpT0Sobr/FZApbeDWwsxVJC3GTkgFTcfrPO1LXI72NlhRlCvaoehrjilePHk6+5Ap1/hXg0Vmqq0KsCQ3MlaLO4XOjJ7F/UGYJKczztdqvqPXwQ1+q7ZqDW/uCKXrI9H0XmuaI61xiTbC1Tvjws4HZrq5mp23RPfT29ETcHm3cxFNchzkGlvod3rH1hUWqufuEGnBIhQTfcZbDS34cxACKYfiP61rqVdoHu27d81gwyN7RcjoNuOm2qo3JwW8FyQEBVw0H5HjQxtRk042ghME11CLTA4G8OTQ1BMbrxfz9QPXEc8y71ZT9YyZ9AjgUY487+Rw6KBgEvK4xrdDCt7HhxwGeU3s8+4eETcCicBr+58ykhcyjm3EuH/t/lMggCnuPWejfYbJae4Gh3lLZW1ZHLR7adsAw89Ju1OF5XTcS+O69p5vi8X6yw== foreman@provisioner
+EOF
diff --git a/ubuntu-16.04/scripts/salt.sh b/ubuntu-16.04/scripts/salt.sh
new file mode 100644
index 0000000..ceec857
--- /dev/null
+++ b/ubuntu-16.04/scripts/salt.sh
@@ -0,0 +1 @@
+apt-get -y install salt-minion reclass
diff --git a/ubuntu-16.04/scripts/security.sh b/ubuntu-16.04/scripts/security.sh
new file mode 100644
index 0000000..5cd8159
--- /dev/null
+++ b/ubuntu-16.04/scripts/security.sh
@@ -0,0 +1,50 @@
+# Auto login root on tty1
+sed 's|/sbin/agetty|/sbin/agetty --autologin root|g' /etc/systemd/system/getty.target.wants/getty@tty1.service > /etc/systemd/system/getty-autologin@.service
+systemctl daemon-reload
+systemctl disable getty@tty1.service
+systemctl enable getty-autologin@tty1.service
+
+# Libvirt serial console support
+cat << 'EOF' >> /etc/systemd/system/getty-serial@.service
+[Unit]
+Description=Getty on %I
+Documentation=man:agetty(8) man:systemd-getty-generator(8)
+Documentation=http://0pointer.de/blog/projects/serial-console.html
+After=systemd-user-sessions.service plymouth-quit-wait.service
+After=rc-local.service
+
+Before=getty.target
+IgnoreOnIsolate=yes
+
+ConditionPathExists=/dev/ttyS0
+
+[Service]
+ExecStart=-/sbin/agetty --autologin root -8 --noclear %I 115200 $TERM
+Type=idle
+Restart=always
+RestartSec=0
+UtmpIdentifier=%I
+TTYPath=/dev/%I
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+KillMode=process
+IgnoreSIGPIPE=no
+SendSIGHUP=yes
+
+Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
+
+[Install]
+WantedBy=getty.target
+DefaultInstance=ttyS0
+EOF
+
+systemctl daemon-reload
+systemctl enable getty-serial@ttyS0.service
+
+# Disable password root login
+usermod -p '!' root
+
+# Disable SSH password authentication and permit root login
+sed -i 's|[#]*PasswordAuthentication yes|PasswordAuthentication no|g' /etc/ssh/sshd_config
+sed -i 's|[#]*PermitRootLogin no|PermitRootLogin yes|g' /etc/ssh/sshd_config
diff --git a/ubuntu-16.04/scripts/vagrant.sh b/ubuntu-16.04/scripts/vagrant.sh
new file mode 100644
index 0000000..06b02cf
--- /dev/null
+++ b/ubuntu-16.04/scripts/vagrant.sh
@@ -0,0 +1,7 @@
+
+mkdir /home/vagrant/.ssh
+wget --no-check-certificate \
+    'https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \
+    -O /home/vagrant/.ssh/authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+chmod -R go-rwsx /home/vagrant/.ssh
diff --git a/ubuntu-16.04/scripts/virtualbox.sh b/ubuntu-16.04/scripts/virtualbox.sh
new file mode 100644
index 0000000..f42d6d6
--- /dev/null
+++ b/ubuntu-16.04/scripts/virtualbox.sh
@@ -0,0 +1 @@
+apt-get -y install virtualbox-guest-utils
diff --git a/ubuntu-16.04/scripts/vmware.sh b/ubuntu-16.04/scripts/vmware.sh
new file mode 100644
index 0000000..bd193ee
--- /dev/null
+++ b/ubuntu-16.04/scripts/vmware.sh
@@ -0,0 +1,2 @@
+apt-get -y install open-vm-tools
+#echo -n ".host:/ /mnt/hgfs vmhgfs rw,ttl=1,uid=my_uid,gid=my_gid,nobootwait 0 0" >> /etc/fstab
diff --git a/ubuntu-16.04/scripts/zerodisk.sh b/ubuntu-16.04/scripts/zerodisk.sh
new file mode 100644
index 0000000..6a658ed
--- /dev/null
+++ b/ubuntu-16.04/scripts/zerodisk.sh
@@ -0,0 +1,2 @@
+dd if=/dev/zero of=/EMPTY bs=1M || true
+rm -f /EMPTY