diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..3e616d6
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,35 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-16.04
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    - name: Install deps
+      run: apt-get install coreutils quilt parted qemu-user-static debootstrap zerofree zip \
+        dosfstools bsdtar libcap2-bin grep rsync xz-utils file git curl bc
+    # Runs a single command using the runners shell
+    - name: Build
+      run: ./build.sh
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: images
+        path: deploy/
diff --git a/build.sh b/build.sh
index a8247ab..4ac1452 100755
--- a/build.sh
+++ b/build.sh
@@ -185,6 +185,9 @@ export CLEAN
 export IMG_NAME
 export APT_PROXY
 
+export HOSTNAME
+export RT_KERNEL_VERSION
+
 export STAGE
 export STAGE_DIR
 export STAGE_WORK_DIR
diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
index eac74ea..6028693 100644
--- a/stage3/00-install-packages/00-packages
+++ b/stage3/00-install-packages/00-packages
@@ -2,14 +2,13 @@ gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-g
 qpdfview gtk2-engines alsa-utils
 desktop-base
 git
-omxplayer
 raspberrypi-artwork
 policykit-1
 gvfs
 rfkill
-chromium-browser rpi-chromium-mods
 gldriver-test
 fonts-droid-fallback
 fonts-liberation2
 obconf
 arandr
+mixxx
diff --git a/stage3/02-install-rt-kernel/01-run.sh b/stage3/02-install-rt-kernel/01-run.sh
new file mode 100644
index 0000000..30dd03e
--- /dev/null
+++ b/stage3/02-install-rt-kernel/01-run.sh
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+wget https://github.com/BlokasLabs/rpi-kernel-rt/archive/${RT_KERNEL_VERSION}.tar.gz -O /tmp/${RT_KERNEL_VERSION}.tar.gz
+
+# Remove regular kernel modules.
+rm -r ${ROOTFS_DIR}/lib/modules/*
+
+tar -xvf /tmp/${RT_KERNEL_VERSION}.tar.gz --strip 1 -C ${ROOTFS_DIR}/
+rm /tmp/${RT_KERNEL_VERSION}.tar.gz
diff --git a/stage4/00-install-packages/00-debconf b/stage4/00-install-packages/00-debconf
deleted file mode 100644
index 87932e2..0000000
--- a/stage4/00-install-packages/00-debconf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enable realtime process priority?
-jackd2  jackd/tweak_rt_limits   boolean true
diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
deleted file mode 100644
index f9f5ef4..0000000
--- a/stage4/00-install-packages/00-packages
+++ /dev/null
@@ -1,25 +0,0 @@
-python python3-pygame python-pygame python-tk
-python3 python3-tk thonny
-python3-pgzero
-python-serial python3-serial
-python-picamera python3-picamera
-debian-reference-en dillo
-raspberrypi-net-mods raspberrypi-ui-mods
-python-pip python3-pip
-python3-numpy
-pypy
-alacarte rc-gui sense-hat
-tree
-libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
-geany
-piclone
-wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python-gpiozero python3-gpiozero python3-rpi.gpio
-python-spidev python3-spidev
-python-twython python3-twython
-python-smbus python3-smbus
-python-flask python3-flask
-pprompt
-piwiz
-rp-prefapps
-ffmpeg
-vlc
diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr
deleted file mode 100644
index b904b80..0000000
--- a/stage4/00-install-packages/00-packages-nr
+++ /dev/null
@@ -1,2 +0,0 @@
-pi-package
-realvnc-vnc-server
diff --git a/stage4/00-install-packages/01-packages b/stage4/00-install-packages/01-packages
deleted file mode 100644
index fdf5e73..0000000
--- a/stage4/00-install-packages/01-packages
+++ /dev/null
@@ -1,22 +0,0 @@
-python-automationhat python3-automationhat
-python-blinkt python3-blinkt
-python-cap1xxx python3-cap1xxx
-python-drumhat python3-drumhat
-python-envirophat python3-envirophat
-python-explorerhat python3-explorerhat
-python-fourletterphat python3-fourletterphat
-python-microdotphat python3-microdotphat
-python-mote python3-mote
-python-motephat python3-motephat
-python-phatbeat python3-phatbeat
-python-pianohat python3-pianohat
-python-piglow python3-piglow
-python-rainbowhat python3-rainbowhat
-python-scrollphat python3-scrollphat
-python-scrollphathd python3-scrollphathd
-python-sn3218 python3-sn3218
-python-skywriter python3-skywriter
-python-touchphat python3-touchphat
-python-buttonshim python3-buttonshim
-python-unicornhathd  python3-unicornhathd
-python-pantilthat python3-pantilthat
diff --git a/stage4/00-install-packages/02-packages b/stage4/00-install-packages/02-packages
deleted file mode 100644
index fc43d17..0000000
--- a/stage4/00-install-packages/02-packages
+++ /dev/null
@@ -1,4 +0,0 @@
-hunspell-en-gb
-hyphen-en-gb
-wamerican
-wbritish
diff --git a/stage4/01-console-autologin/00-run.sh b/stage4/01-console-autologin/00-run.sh
deleted file mode 100755
index 665dcdb..0000000
--- a/stage4/01-console-autologin/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-	SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_boot_behaviour B4
-EOF
diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh
deleted file mode 100755
index 6a24f82..0000000
--- a/stage4/02-extras/00-run.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-#Alacarte fixes
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share/applications"
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share/desktop-directories"
diff --git a/stage4/03-bookshelf/00-run.sh b/stage4/03-bookshelf/00-run.sh
deleted file mode 100755
index 5bd9885..0000000
--- a/stage4/03-bookshelf/00-run.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-BOOKSHELF_URL="https://magpi.raspberrypi.org/bookshelf.xml"
-GUIDE_URL="$(curl -s "$BOOKSHELF_URL" | awk -F '[<>]' "/<TITLE>Raspberry Pi Beginner's Guide v3<\/TITLE>/ {f=1; next} f==1 && /PDF/ {print \$3; exit}")"
-OUTPUT="$(basename "$GUIDE_URL" | cut -f1 -d'?')"
-
-if [ ! -f "files/$OUTPUT" ]; then
-	rm files/*.pdf -f
-	curl -s "$GUIDE_URL" -o "files/$OUTPUT"
-fi
-
-file "files/$OUTPUT" | grep -q "PDF document"
-
-install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf"
-install -v -o 1000 -g 1000 -m 644 "files/$OUTPUT" "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Bookshelf/"
diff --git a/stage4/03-bookshelf/files/.gitignore b/stage4/03-bookshelf/files/.gitignore
deleted file mode 100644
index a136337..0000000
--- a/stage4/03-bookshelf/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pdf
diff --git a/stage4/04-enable-xcompmgr/00-run.sh b/stage4/04-enable-xcompmgr/00-run.sh
deleted file mode 100755
index ad6298d..0000000
--- a/stage4/04-enable-xcompmgr/00-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-	raspi-config nonint do_xcompmgr 0
-EOF
diff --git a/stage4/EXPORT_IMAGE b/stage4/EXPORT_IMAGE
deleted file mode 100644
index 79ec11a..0000000
--- a/stage4/EXPORT_IMAGE
+++ /dev/null
@@ -1,4 +0,0 @@
-IMG_SUFFIX=""
-if [ "${USE_QEMU}" = "1" ]; then
-	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
-fi
diff --git a/stage4/EXPORT_NOOBS b/stage4/EXPORT_NOOBS
deleted file mode 100644
index 2ef6d7b..0000000
--- a/stage4/EXPORT_NOOBS
+++ /dev/null
@@ -1,2 +0,0 @@
-NOOBS_NAME="Raspbian"
-NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop"
diff --git a/stage4/prerun.sh b/stage4/prerun.sh
deleted file mode 100755
index 9acd13c..0000000
--- a/stage4/prerun.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-if [ ! -d "${ROOTFS_DIR}" ]; then
-	copy_previous
-fi
diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages
deleted file mode 100644
index 609e718..0000000
--- a/stage5/00-install-extras/00-packages
+++ /dev/null
@@ -1,16 +0,0 @@
-mu-editor
-sonic-pi
-scratch nuscratch scratch2 scratch3
-smartsim
-
-minecraft-pi python-minecraftpi python-picraft python3-picraft
-python-sense-emu sense-emu-tools python-sense-emu-doc
-
-wolfram-engine
-claws-mail
-greenfoot-unbundled bluej
-nodered
-realvnc-vnc-viewer
-
-python-games
-code-the-classics
diff --git a/stage5/00-install-libreoffice/00-packages b/stage5/00-install-libreoffice/00-packages
deleted file mode 100644
index 148e7b9..0000000
--- a/stage5/00-install-libreoffice/00-packages
+++ /dev/null
@@ -1,3 +0,0 @@
-libreoffice-pi
-libreoffice-help-en-gb
-libreoffice-l10n-en-gb
diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE
deleted file mode 100644
index a81a844..0000000
--- a/stage5/EXPORT_IMAGE
+++ /dev/null
@@ -1,4 +0,0 @@
-IMG_SUFFIX="-full"
-if [ "${USE_QEMU}" = "1" ]; then
-	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
-fi
diff --git a/stage5/EXPORT_NOOBS b/stage5/EXPORT_NOOBS
deleted file mode 100644
index cb10203..0000000
--- a/stage5/EXPORT_NOOBS
+++ /dev/null
@@ -1,2 +0,0 @@
-NOOBS_NAME="Raspbian Full"
-NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications"
diff --git a/stage5/prerun.sh b/stage5/prerun.sh
deleted file mode 100755
index 9acd13c..0000000
--- a/stage5/prerun.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-if [ ! -d "${ROOTFS_DIR}" ]; then
-	copy_previous
-fi