diff --git a/Dockerfile b/Dockerfile
index ac0d823..a0d276b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,8 @@ FROM ubuntu:15.04
 MAINTAINER Jim Myhrberg "contact@jimeh.me"
 
 ENV ZNC_VERSION 1.6.1
+ADD docker-entrypoint.sh /entrypoint.sh
+ADD znc.conf.default /znc.conf.default
 
 RUN apt-get update \
     && apt-get install -y sudo wget build-essential libssl-dev libperl-dev \
@@ -19,12 +21,9 @@ RUN apt-get update \
     && apt-get remove -y wget \
     && apt-get autoremove -y \
     && apt-get clean \
-    && rm -rf /src* /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN useradd znc
-ADD docker-entrypoint.sh /entrypoint.sh
-ADD znc.conf.default /znc.conf.default
-RUN chmod 644 /znc.conf.default
+    && rm -rf /src* /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    && useradd znc \
+    && chmod 644 /znc.conf.default
 
 VOLUME /znc-data