diff --git a/ubuntu-14.04/scripts/base.sh b/ubuntu-14.04/scripts/base.sh
index bf48d89..babf3a8 100644
--- a/ubuntu-14.04/scripts/base.sh
+++ b/ubuntu-14.04/scripts/base.sh
@@ -30,23 +30,5 @@
 set -g xterm-keys on
 EOF
 
-# Libvirt serial console support
-cat << 'EOF' >> /etc/init/ttyS0.conf
-# ttyS0 - getty
-#
-# This service maintains a getty on tty1 from the point the system is
-# started until it is shut down again.
-
-start on stopped rc RUNLEVEL=[2345] and (
-            not-container or
-            container CONTAINER=lxc or
-            container CONTAINER=lxc-libvirt)
-
-stop on runlevel [!2345]
-
-respawn
-exec /sbin/getty --autologin root -8 115200 ttyS0 xterm
-EOF
-
 # Setup cloud-init
 apt-get -y install cloud-init
diff --git a/ubuntu-14.04/scripts/security.sh b/ubuntu-14.04/scripts/security.sh
index 7dd89b6..3026626 100644
--- a/ubuntu-14.04/scripts/security.sh
+++ b/ubuntu-14.04/scripts/security.sh
@@ -1,6 +1,24 @@
 # Auto login root on tty1
 sed -i 's|/sbin/getty|/sbin/getty --autologin root|g' /etc/init/tty1.conf
 
+# Libvirt serial console support
+cat << 'EOF' >> /etc/init/ttyS0.conf
+# ttyS0 - getty
+#
+# This service maintains a getty on tty1 from the point the system is
+# started until it is shut down again.
+
+start on stopped rc RUNLEVEL=[2345] and (
+            not-container or
+            container CONTAINER=lxc or
+            container CONTAINER=lxc-libvirt)
+
+stop on runlevel [!2345]
+
+respawn
+exec /sbin/getty --autologin root -8 115200 ttyS0 xterm
+EOF
+
 # Disable password root login
 usermod -p '!' root