diff --git a/Dockerfile b/Dockerfile
index eecb835e7724718ac7377af5c88b79eb8dc559b0..8236c30faa84de87fa400249c7cbfc6f5a14d9ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,9 @@ 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 GRADLE_VERSION "2.12"
-ENV PATH "$PATH:/sdk/tools/templates/gradle/wrapper:/sdk/tools/"
-ENV DEBIAN_FRONTEND noninteractive
 ENV ANDROID_HOME "/sdk"
+ENV PATH "$PATH:${ANDROID_HOME}/tools"
+ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -31,6 +30,6 @@ RUN rm -f /etc/ssl/certs/java/cacerts; \
 ADD http://dl.google.com/android/android-sdk_r${SDK_VERSION}-linux.tgz /sdk.tgz
 RUN tar zxvf sdk.tgz && \
     rm -v /sdk.tgz && \
-    mv /android-sdk-linux /sdk
+    mv /android-sdk-linux ${ANDROID_HOME}
 
-RUN (while [ 1 ]; do sleep 5; echo y; done) | /sdk/tools/android update sdk -u -a -t ${SDK_PACKAGES}
+RUN (while [ 1 ]; do sleep 5; echo y; done) | ${ANDROID_HOME}/tools/android update sdk -u -a -t ${SDK_PACKAGES}