diff --git a/Dockerfile b/Dockerfile
index aa1d11c..5eea451 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,11 @@ FROM logicify/tomcat:latest
 USER app
 WORKDIR /srv/apache-tomcat
 
-ENV TEAMCITY_VERSION 2017.2.1
-ENV TEAMCITY_WEBAPP_PATH ROOT
+ARG ARG_TEAMCITY_VERSION=2018.2.2
+ARG ARG_TEAMCITY_WEBAPP_PATH=ROOT
+
+ENV TEAMCITY_VERSION $ARG_TEAMCITY_VERSION
+ENV TEAMCITY_WEBAPP_PATH $ARG_TEAMCITY_WEBAPP_PATH
 
 ENV CATALINA_OPTS \
  -Xms768m \