diff --git a/aria2/Dockerfile b/aria2/Dockerfile
index 5169049..b340874 100644
--- a/aria2/Dockerfile
+++ b/aria2/Dockerfile
@@ -5,19 +5,20 @@
 FROM alpine
 MAINTAINER kev <noreply@datageek.info>
 
-RUN apk add -U aria2 \
+ENV TOKEN 00000000-0000-0000-0000-000000000000
+
+RUN set -xe \
+    && apk add -U aria2 \
     && rm -rf /var/cache/apk/* \
-    && aria2c https://github.com/tianon/gosu/releases/download/1.4/gosu-amd64 -o /usr/local/bin/gosu \
+    && aria2c https://github.com/tianon/gosu/releases/download/1.7/gosu-amd64 -o /usr/local/bin/gosu \
     && chmod +x /usr/local/bin/gosu \
     && adduser -D aria2
 
 COPY aria2.conf /etc/aria2/
 VOLUME /home/aria2 /etc/aria2
 
-ENV TOKEN  00000000-0000-0000-0000-000000000000
-
-CMD chown -R aria2:aria2 /home/aria2 \
+EXPOSE 6800
+CMD set -xe \
+    && chown -R aria2:aria2 /home/aria2 \
     && gosu aria2 aria2c --conf-path=/etc/aria2/aria2.conf \
                          --rpc-secret=${TOKEN}
-
-EXPOSE 6800