diff --git a/day01-image/scripts/base.sh b/day01-image/scripts/base.sh
deleted file mode 100644
index 675bcfd..0000000
--- a/day01-image/scripts/base.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash -xe
-
-UBUNTU_BASEURL="${UBUNTU_BASEURL:-mirror://mirrors.ubuntu.com/mirrors.txt}"
-
-## Base packages and setup
-export DEBIAN_FRONTEND=noninteractive
-echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d
-chmod +x /usr/sbin/policy-rc.d
-
-# Configure apt. Please refer to
-# https://github.com/Mirantis/reclass-system-salt-model/blob/master/linux/system/single/debian.yml
-# and keep those structures with same naming convention - to prevent
-# misconfiguration between base system and salt state.
-echo "Acquire::CompressionTypes::Order gz;" >/etc/apt/apt.conf.d/99compression-workaround-salt
-echo "Acquire::EnableSrvRecords false;" >/etc/apt/apt.conf.d/99enablesrvrecords-false
-echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99aws-s3-mirrors-workaround-salt
-echo "APT::Install-Recommends false;" > /etc/apt/apt.conf.d/99dont_install_recommends-salt
-echo "APT::Install-Suggests false;" > /etc/apt/apt.conf.d/99dont_install_suggests-salt
-echo "Acquire::Languages none;" > /etc/apt/apt.conf.d/99dont_acquire_all_languages-salt
-echo "APT::Periodic::Update-Package-Lists 0;" > /etc/apt/apt.conf.d/99dont_update_package_list-salt
-echo "APT::Periodic::Download-Upgradeable-Packages 0;" > /etc/apt/apt.conf.d/99dont_update_download_upg_packages-salt
-echo "APT::Periodic::Unattended-Upgrade 0;" > /etc/apt/apt.conf.d/99disable_unattended_upgrade-salt
-
-sysctl -w fs.file-max=100000
-# Overwrite default mirrors
-echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial main restricted multiverse universe" > /etc/apt/sources.list
-echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial-updates main restricted multiverse universe" >> /etc/apt/sources.list
-echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial-security main restricted multiverse universe" >> /etc/apt/sources.list
-#echo "deb [arch=amd64] ${UBUNTU_BASEURL} xenial-backports main restricted multiverse universe" >> /etc/apt/sources.list
-echo '127.0.0.1 localhost' >> /etc/hosts
-echo '127.0.0.1 cfg01 cfg' >> /etc/hosts
-
-apt-get clean
-apt-get update
-
-# Useful tools
-apt-get -y install byobu curl ethtool htop iputils-ping lsof strace tcpdump tmux traceroute tree vim-nox wget
-# Install common prerequisites
-apt-get -y install apt-transport-https libmnl0 python-apt python-m2crypto python-psutil acpid
-
-# Cleanup old kernels, ensure latest is installed via virtual package
-if [ ! -f /tmp/no_install_kernel ]; then
-    apt-get purge -y linux-image-* linux-headers-*
-    apt-get install -y linux-image-virtual-lts-xenial linux-image-extra-virtual-lts-xenial
-
-    # 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
-
-# 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
-
-# Disable apt-daily
-systemctl disable apt-daily.timer
diff --git a/day01-image/scripts/base.sh b/day01-image/scripts/base.sh
new file mode 120000
index 0000000..140d77f
--- /dev/null
+++ b/day01-image/scripts/base.sh
@@ -0,0 +1 @@
+../../common/ubuntu_base.sh
\ No newline at end of file
diff --git a/day01-image/scripts/base_set_hostname.sh b/day01-image/scripts/base_set_hostname.sh
new file mode 100644
index 0000000..eb1a10e
--- /dev/null
+++ b/day01-image/scripts/base_set_hostname.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -xe
+
+echo '127.0.0.1 localhost' >> /etc/hosts
+echo '127.0.0.1 cfg01 cfg' >> /etc/hosts