diff --git a/Dockerfile b/Dockerfile
index d179f3c..dec7f27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,21 @@
+FROM golang:latest
+
+ENV ts3_ip=0.0.0.0
+ENV ts3_name=serveradmin
+ENV ts3_pw=f3gWdOU3
+ENV ts3_port=9987
+ENV ts3_query=10011
+ENV web_port=8080
 
-ARG ts3_ip=0.0.0.0
-ARG ts3_name=serveradmin
-ARG ts3_pw=f3gWdOU3
-ARG ts3_port=9987
-ARG ts3_query=10011
-ARG web_port=8080
 
-FROM golang:latest 	
 RUN mkdir /app 		
 WORKDIR /app
-RUN mkdir /app/go	
+RUN mkdir /app/go	    
 RUN export GOPATH=/app/go
 COPY main.go .
 RUN go get; exit 0
 WORKDIR $GOPATH/src/git.cliffbreak.de/Cliffbreak/tsviewer
 COPY config.json .
-RUN go build -ts3_ip=$ts3_ip -ts3_name=$ts3_name -ts3_pw=$ts3_pw -ts3_port=$ts3_port -ts3_query=$ts3_query -web_port=$web_port
+RUN go build 
 EXPOSE 8080
-CMD ["./tsviewer"]  
\ No newline at end of file
+CMD ["./tsviewer", "-ts3_ip=$ts3_ip", "-ts3_name=$ts3_name", "-ts3_pw=$ts3_pw","-ts3_port=$ts3_port", "-ts3_query=$ts3_query", "-web_port=$web_port"]  
\ No newline at end of file