diff --git a/Dockerfile b/Dockerfile
index 2ace8a5..ffb2838 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,28 @@
 FROM node:14.8.0-stretch
 
+ENV STORAGE_TYPE=memcached \
+    STORAGE_HOST=127.0.0.1 \
+    STORAGE_PORT=11211 \
+    STORAGE_EXPIRE_SECONDS=2592000 \
+    STORAGE_DB=2 \
+    LOGGING_LEVEL=verbose \
+    LOGGING_TYPE=Console \
+    LOGGING_COLORIZE=true \
+    HOST=0.0.0.0 \
+    PORT=7777 \
+    KEY_LENGTH=10 \
+    MAX_LENGTH=400000 \
+    STATIC_MAX_AGE=86400 \
+    RECOMPRESS_STATIC_ASSETS=true \
+    KEYGENERATOR_TYPE=phonetic \
+    RATELIMITS_NORMAL_TOTAL_REQUESTS=500 \
+    RATELIMITS_NORMAL_EVERY_MILLISECONDS=60000 \
+    # comma separated list for the whitelisted \
+    RATELIMITS_WHITELIST=example1.whitelist,example2.whitelist \
+    # comma separated list for the blacklisted \
+    RATELIMITS_BLACKLIST=example1.blacklist,example2.blacklist \
+    DOCUMENTS=about=./about.md
+
 RUN mkdir -p /usr/src/app && \
     chown node:node /usr/src/app
 
@@ -16,44 +39,6 @@ RUN npm install && \
     npm install aws-sdk@2.738.0 && \
     npm install rethinkdbdash@2.3.31
 
-ENV STORAGE_TYPE=memcached \
-    STORAGE_HOST=127.0.0.1 \
-    STORAGE_PORT=11211\
-    STORAGE_EXPIRE_SECONDS=2592000\
-    STORAGE_DB=2 \
-    STORAGE_AWS_BUCKET= \
-    STORAGE_AWS_REGION= \
-    STORAGE_USENAME= \
-    STORAGE_PASSWORD= \
-    STORAGE_FILEPATH=
-
-ENV LOGGING_LEVEL=verbose \
-    LOGGING_TYPE=Console \
-    LOGGING_COLORIZE=true
-
-ENV HOST=0.0.0.0\
-    PORT=7777\
-    KEY_LENGTH=10\
-    MAX_LENGTH=400000\
-    STATIC_MAX_AGE=86400\
-    RECOMPRESS_STATIC_ASSETS=true
-
-ENV KEYGENERATOR_TYPE=phonetic \
-    KEYGENERATOR_KEYSPACE=
-
-ENV RATELIMITS_NORMAL_TOTAL_REQUESTS=500\
-    RATELIMITS_NORMAL_EVERY_MILLISECONDS=60000 \
-    RATELIMITS_WHITELIST_TOTAL_REQUESTS= \
-    RATELIMITS_WHITELIST_EVERY_MILLISECONDS=  \
-    # comma separated list for the whitelisted \
-    RATELIMITS_WHITELIST=example1.whitelist,example2.whitelist \
-    \
-    RATELIMITS_BLACKLIST_TOTAL_REQUESTS= \
-    RATELIMITS_BLACKLIST_EVERY_MILLISECONDS= \
-    # comma separated list for the blacklisted \
-    RATELIMITS_BLACKLIST=example1.blacklist,example2.blacklist
-ENV DOCUMENTS=about=./about.md
-
 EXPOSE ${PORT}
 STOPSIGNAL SIGINT
 ENTRYPOINT [ "bash", "docker-entrypoint.sh" ]