diff --git a/aria2/Dockerfile b/aria2/Dockerfile
index 957aea5..c5f49ba 100644
--- a/aria2/Dockerfile
+++ b/aria2/Dockerfile
@@ -5,20 +5,18 @@
 FROM alpine:3
 MAINTAINER EasyPi Software Foundation
 
-RUN set -xe \
-    && apk add --no-cache aria2 \
-    && aria2c https://github.com/tianon/gosu/releases/download/1.14/gosu-amd64 -o /usr/local/bin/gosu \
-    && chmod +x /usr/local/bin/gosu \
-    && adduser -D aria2
+RUN apk add --no-cache aria2
 
-COPY ./data/aria2.conf /etc/aria2/
-VOLUME /data /etc/aria2
-WORKDIR /data
-EXPOSE 6800
+COPY ./data/etc/aria2.conf /etc/aria2/
 
+ENV DIR=/data
+ENV PORT=6800
 ENV TOKEN=00000000-0000-0000-0000-000000000000
 
-CMD set -xe \
-    && chown -R aria2:aria2 /data \
-    && gosu aria2 aria2c --conf-path=/etc/aria2/aria2.conf \
-                         --rpc-secret=${TOKEN}
+WORKDIR $DIR
+EXPOSE ${PORT}
+
+CMD aria2c --conf-path=/etc/aria2/aria2.conf \
+           --rpc-listen-port=${PORT} \
+           --rpc-secret=${TOKEN} \
+           --dir=${DIR}
diff --git a/aria2/README.md b/aria2/README.md
index e90535d..577d091 100644
--- a/aria2/README.md
+++ b/aria2/README.md
@@ -13,12 +13,13 @@ aria2
 ~/fig/aria2/
 ├── docker-compose.yml
 └── data/
-    ├── disk/ -> /mnt/usb/
-    ├── default.conf
-    └── aria2.conf
+    ├── var/ -> /mnt/usb/
+    └── etc/
+        ├── default.conf
+        └── aria2.conf
 ```
 
-> You may make `disk` a symbolic link to `/mnt/usb` or somewhere else.
+> You may make `var` a symbolic link to `/mnt/usb` or somewhere else.
 > To implement disk quota, you can even create a [virtual disk][5].
 
 ## docker-compose.yml
@@ -33,10 +34,10 @@ services:
     ports:
       - "6800:6800"
     volumes:
-      - ./data/aria2.conf:/etc/aria2/aria2.conf
-      - ./data/disk:/data
+      - ./data/etc:/etc/aria2/
+      - ./data/var:/data
     environment:
-      - TOKEN=e6c3778f-6361-4ed0-b126-f2cf8fca06db
+      - TOKEN=0d5e0e73-96f7-4936-b125-e8f5f2296b08
     restart: unless-stopped
 
   webui:
diff --git a/aria2/data/aria2.conf b/aria2/data/etc/aria2.conf
similarity index 100%
rename from aria2/data/aria2.conf
rename to aria2/data/etc/aria2.conf
diff --git a/aria2/data/default.conf b/aria2/data/etc/default.conf
similarity index 100%
rename from aria2/data/default.conf
rename to aria2/data/etc/default.conf
diff --git a/aria2/docker-compose.yml b/aria2/docker-compose.yml
index da9de60..dbdc68c 100644
--- a/aria2/docker-compose.yml
+++ b/aria2/docker-compose.yml
@@ -7,10 +7,10 @@ services:
     ports:
       - "6800:6800"
     volumes:
-      - ./data/aria2.conf:/etc/aria2/aria2.conf
-      - ./data/disk:/data
+      - ./data/etc:/etc/aria2/
+      - ./data/var:/data
     environment:
-      - TOKEN=e6c3778f-6361-4ed0-b126-f2cf8fca06db
+      - TOKEN=0d5e0e73-96f7-4936-b125-e8f5f2296b08
     restart: unless-stopped
 
   webui: