diff --git a/Dockerfile b/Dockerfile
index 7575032..4d72965 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,10 @@
 FROM ubuntu:16.04
 MAINTAINER Michael Stucki <michael@stucki.io>
 
+ENV \
+# Extra include PATH, it may not include /usr/local/(s)bin on some systems
+    PATH=$PATH:/usr/local/bin/
+
 RUN sed -i 's/main$/main universe/' /etc/apt/sources.list \
  && export DEBIAN_FRONTEND=noninteractive \
  && apt-get update \
@@ -63,9 +67,8 @@ RUN \
     useradd --gid $hostgid --uid $hostuid --non-unique build && \
     rsync -a /etc/skel/ /home/build/
 
-RUN mkdir /home/build/bin
-RUN curl http://commondatastorage.googleapis.com/git-repo-downloads/repo > /home/build/bin/repo
-RUN chmod a+x /home/build/bin/repo
+RUN curl http://commondatastorage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo \
+ && chmod a+x /usr/local/bin/repo
 
 # Add sudo permission
 RUN echo "build ALL=NOPASSWD: ALL" > /etc/sudoers.d/build
diff --git a/android-env-vars.sh b/android-env-vars.sh
index ff569ee..141f7d1 100644
--- a/android-env-vars.sh
+++ b/android-env-vars.sh
@@ -1,4 +1,3 @@
-export PATH=/home/build/bin:$PATH
 export USE_CCACHE=1
 export CCACHE_DIR=/srv/ccache
 export CCACHE_COMPRESS=1