diff --git a/znc/Dockerfile b/znc/Dockerfile
index 8d9c6bc..d500dcc 100644
--- a/znc/Dockerfile
+++ b/znc/Dockerfile
@@ -7,6 +7,7 @@ RUN apt-get update && apt-get install -y \
     libperl-dev \
     pkg-config \
     curl \
+    sudo \
     --no-install-recommends
 
 # get the source
@@ -15,7 +16,21 @@ RUN curl -sSL http://znc.in/releases/znc-latest.tar.gz | tar -v -C /znc-tmp -xz
 RUN mv /znc-tmp/znc* /znc; rm -rf /znc-tmp
 
 # install it
-RUN cd /znc; ./configure; make; make install
+RUN cd /znc; ./configure; make -j8; make install
+RUN rm -rf /znc
+RUN mkdir /znc
+ADD znc-shim /usr/local/bin/znc-shim
+
+RUN adduser \
+    --system \
+    --home=/znc \
+    --shell=/bin/sh \
+    --no-create-home \
+    --group \
+    znc
+
+WORKDIR /znc
+ENTRYPOINT ["/usr/local/bin/znc-shim"]
 
 # make basic config
 # RUN znc --makeconf
@@ -23,4 +38,4 @@ RUN cd /znc; ./configure; make; make install
 # add local config
 # ADD conf /.znc
 
-# CMD [ "znc", "-f", "-r" ]
\ No newline at end of file
+# CMD [ "znc", "-f", "-r" ]
diff --git a/znc/znc-shim b/znc/znc-shim
new file mode 100755
index 0000000..bec8e71
--- /dev/null
+++ b/znc/znc-shim
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+ZNC_DIR="/znc"
+ZNC_OWNER=$(stat -c "%U" ${ZNC_DIR})
+
+if [ "${ZNC_OWNER}" != "znc" ]; then
+    chown -R znc:znc ${ZNC_DIR}
+fi
+
+exec sudo -u znc "$@"