diff --git a/Dockerfile b/Dockerfile
index 7916e0cb..58c80288 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,31 +7,27 @@ RUN apt-get update && apt-get install -y locales git build-essential \
 
 WORKDIR /
 
-RUN dpkg-reconfigure locales && \
-	locale-gen C.UTF-8 && \
-	/usr/sbin/update-locale LANG=C.UTF-8
+RUN dpkg-reconfigure locales \
+ && locale-gen C.UTF-8 \
+ && /usr/sbin/update-locale LANG=C.UTF-8 \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/* \
+ && useradd -ms /bin/bash -d /c3nav -u 15371 c3navuser \
+ && mkdir /etc/c3nav && mkdir /data && mkdir /data/map
+
 ENV LC_ALL C.UTF-8
 
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
-
-RUN useradd -ms /bin/bash -d /c3nav -u 15371 c3navuser
-RUN echo 'c3navuser ALL=(ALL) NOPASSWD: /usr/bin/supervisord' >> /etc/sudoers
-
-RUN mkdir /etc/c3nav
-RUN mkdir /data
-RUN mkdir /data/map
-
 COPY src /c3nav/src
 WORKDIR /c3nav/src
 
-RUN pip3 install -U pip wheel setuptools
-RUN pip3 install -r requirements.txt -r requirements/mysql.txt -r requirements/postgres.txt \
-	-r requirements/memcached.txt -r requirements/redis.txt gunicorn
-
-RUN mkdir /static && chown -R c3navuser:c3navuser /static /c3nav /data
-
 COPY deployment/docker/c3nav.bash /usr/local/bin/c3nav
-RUN chmod +x /usr/local/bin/c3nav
+
+RUN pip3 install -U pip wheel setuptools \
+ && pip3 install -r requirements.txt -r requirements/mysql.txt -r requirements/postgres.txt \
+	-r requirements/memcached.txt -r requirements/redis.txt gunicorn \
+ && mkdir /static \
+ && chown -R c3navuser:c3navuser /static /c3nav /data \
+ && chmod +x /usr/local/bin/c3nav
 
 USER c3navuser