diff --git a/Dockerfile b/Dockerfile
index aae76f5739b3d64e380bb47c5630e845b71b3c01..d5ff8edd5dc9a7651afb0b7c5a1490d05556ec61 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,12 @@
 FROM ubuntu:15.10
 MAINTAINER Jan Grewe <jan@faked.org>
 
-ENV SDK_VERSION "24.4.1"
-ENV SDK_PACKAGES "platform-tools,build-tools-23.0.3,android-23,addon-google_apis-google-23,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository"
+ENV VERSION_SDK_TOOLS "25.1.1"
+ENV VERSION_BUILD_TOOLS "23.0.3"
+ENV VERSION_TARGET_SDK "23"
+
+ENV SDK_PACKAGES "build-tools-${VERSION_BUILD_TOOLS},android-${VERSION_TARGET_SDK},addon-google_apis-google-${VERSION_TARGET_SDK},platform-tools,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository"
+
 ENV ANDROID_HOME "/sdk"
 ENV PATH "$PATH:${ANDROID_HOME}/tools"
 ENV DEBIAN_FRONTEND noninteractive
@@ -28,7 +32,7 @@ RUN apt-get update && \
 RUN rm -f /etc/ssl/certs/java/cacerts; \
     /var/lib/dpkg/info/ca-certificates-java.postinst configure
 
-ADD http://dl.google.com/android/android-sdk_r${SDK_VERSION}-linux.tgz /sdk.tgz
+ADD http://dl.google.com/android/android-sdk_r${VERSION_SDK_TOOLS}-linux.tgz /sdk.tgz
 RUN tar zxvf sdk.tgz && \
     rm -v /sdk.tgz && \
     mv /android-sdk-linux ${ANDROID_HOME}