diff --git a/Dockerfile b/Dockerfile
index e906f7d..6a54eac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,36 @@
 FROM kdeneon/plasma:dev-unstable
 MAINTAINER Jonathan Riddell <jr@jriddell.org>
-USER root
-RUN apt-get update && \
-    apt-get install -y kdesdk-devenv-dependencies
+ADD public.key /
+ADD neon.list /etc/apt/sources.list.d/
+ADD bash-prompt /
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
+    echo keyboard-configuration keyboard-configuration/layout select 'English (US)' | debconf-set-selections && \
+    echo keyboard-configuration keyboard-configuration/layoutcode select 'us' | debconf-set-selections && \
+    echo "resolvconf resolvconf/linkify-resolvconf boolean false" | debconf-set-selections && \
+    apt-key add /public.key && \
+    rm /public.key && \
+    apt-get update && \
+    apt-get install -y ubuntu-minimal ubuntu-standard neon-desktop plasma-workspace-wayland kwin-wayland kwin-wayland-backend-x11 kwin-wayland-backend-wayland kwin kdesdk-devenv-dependencies && \
+    apt-get dist-upgrade -y && \
+    groupadd admin && \
+    useradd -G admin,video -ms /bin/bash neon && \
+    # Refresh apt cache once more now that appstream is installed \
+    rm -r /var/lib/apt/lists/* && \
+    apt-get update && \
+    # Blank password \
+    echo 'neon:U6aMy0wojraho' | chpasswd -e && \
+    echo 'neon ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
+    apt-get clean && \
+    # Wayland bits \
+    mkdir /run/neon && \
+    chown neon:neon /run/neon && \
+    export PS1=`cat /bash-prompt`
 ENV DISPLAY=:1
 ENV KDE_FULL_SESSION=true
+ENV SHELL=/bin/bash
 
 ENV XDG_RUNTIME_DIR=/run/neon
 USER neon
+COPY gitconfig $HOME/.gitconfig
 WORKDIR /home/neon
 CMD startkde
diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..0fad5cc
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,9 @@
+[url "git://anongit.kde.org/"]
+    insteadOf = kde:
+[url "ssh://git@git.kde.org/"]
+    pushInsteadOf = kde:
+
+[url "git://anongit.neon.kde.org/"]
+    insteadOf = neon:
+[url "ssh://neon@git.neon.kde.org/"]
+    pushInsteadOf = neon: