diff --git a/Dockerfile b/Dockerfile
index 052641a..040d8ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,17 @@
+FROM alpine:3.7 AS ts3client-download
+
+ARG TS3CLIENT_VERSION=3.1.8
+
+# Install TeamSpeak3.
+# Original comment that used to be here: temporary non-interactive teamspeak3 install hack, remove before publishing!!
+# In fact, it would be nice if we had some lazy handling code for this that just requires the user to provide a "--agree-with-license" once.
+ADD "http://teamspeak.gameserver.gamed.de/ts3/releases/${TS3CLIENT_VERSION}/TeamSpeak3-Client-linux_amd64-${TS3CLIENT_VERSION}.run" /ts3client.run
+RUN sed -i 's/^MS_PrintLicense$/#MS_PrintLicense/g' /ts3client.run
+RUN chmod +x /ts3client.run
+RUN /ts3client.run --quiet --target ts3client
+
+###
+
 FROM node:7.10.0
 
 # Install runtime packages
@@ -16,14 +30,14 @@ RUN mkdir -p /tmp/empty &&\
 	useradd -d /home/app -l -N -g app -m -k /tmp/empty -u 9999 app &&\
 	rmdir /tmp/empty
 
-ARG TS3CLIENT_VERSION=3.0.19.4
-
 COPY . /home/app/ts3bot/
 RUN cd ~app/ts3bot &&\
 	sed -i 's,\r,,g' setup.sh &&\
 	sh setup.sh
 
-# Startup configuration
 WORKDIR /home/app
+COPY --from=ts3client-download /ts3client/ ./ts3client
+
+# Startup configuration
 USER app
 CMD [ "ts3bot", "--ts3-install-path=/home/app/ts3client" ]
diff --git a/setup.sh b/setup.sh
index 1a276eb..9bec88b 100644
--- a/setup.sh
+++ b/setup.sh
@@ -22,18 +22,6 @@ apt-mark auto \
 mkdir -p /config
 ln -sf /config ~app/.ts3bot
 
-# Install TeamSpeak3.
-# Original comment that used to be here: temporary non-interactive teamspeak3 install hack, remove before publishing!!
-# In fact, it would be nice if we had some lazy handling code for this that just requires the user to provide a "--agree-with-license" once.
-(
-	cd ~app
-	wget "http://teamspeak.gameserver.gamed.de/ts3/releases/${TS3CLIENT_VERSION}/TeamSpeak3-Client-linux_amd64-${TS3CLIENT_VERSION}.run" -Ots3client.run
-	chmod +x ./ts3client.run
-	sed -i 's/^MS_PrintLicense$/#MS_PrintLicense/g' ./ts3client.run
-	./ts3client.run --quiet --target ts3client
-	rm ./ts3client.run
-)
-
 # Install TS3Bot
 (
 	cd ~app/ts3bot