diff --git a/Dockerfile b/Dockerfile
index c5bf50f..c8623da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,33 @@
-FROM ubuntu
+FROM debian:stretch
 
-ENV TERRARIA_VERISON=1344
+ENV TERRARIA_VERISON=1353 \
+    DUMB_INIT_VERSION=1.2.1
 
-RUN apt-get update \
- && apt-get install -y bash curl unzip \
- && adduser gameserver \
- && mkdir /data && chown gameserver: /data
+RUN set -ex \
+ && apt-get update \
+ && apt-get install --no-install-recommends -y \
+      bash \
+      ca-certificates \
+      curl \
+      unzip \
+ && useradd -m gameserver \
+ && mkdir /data && chown gameserver: /data \
+ && curl -sSfLo /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_amd64 \
+ && chmod +x /usr/local/bin/dumb-init \
+ && rm -rf /var/cache/apk/*
 
 USER gameserver
 ENV HOME /home/gameserver
 ENV SERVER $HOME/terraria
 
-RUN mkdir -p ${SERVER} \
- && curl -sSLo /tmp/terraria.zip http://terraria.org/server/terraria-server-${TERRARIA_VERISON}.zip \
- && unzip -d ${SERVER} /tmp/terraria.zip \
- && ln -s ${SERVER}/terraria-server-* ${SERVER}/server
+RUN set -ex \
+ && mkdir -p ${SERVER} \
+ && curl -sSLo /tmp/terraria.zip http://terraria.org/server/terraria-server-${TERRARIA_VERISON}.zip && unzip -d ${SERVER} /tmp/terraria.zip \
+ && ln -s ${SERVER}/terraria-server-* ${SERVER}/server \
+ && rm /tmp/terraria.zip
 
-ADD config.ini ${SERVER}/config.ini.default
-ADD start.sh ${SERVER}/start.sh
+COPY config.ini ${SERVER}/config.ini.default
+COPY start.sh ${SERVER}/start.sh
 
 VOLUME /data
 EXPOSE 7777/udp 7777