diff --git a/Dockerfile b/Dockerfile
index 68d1c27..ea12d4b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,8 +31,8 @@ RUN mkdir /home/cmbuild/bin
 RUN curl http://commondatastorage.googleapis.com/git-repo-downloads/repo > /home/cmbuild/bin/repo
 RUN chmod a+x /home/cmbuild/bin/repo
 
-RUN echo "export PATH=${PATH}:/home/cmbuild/bin" >> /etc/bash.bashrc
-RUN echo "export USE_CCACHE=1" >> /etc/bash.bashrc
+ADD android-env-vars.sh /etc/android-env-vars.sh
+RUN echo "source /etc/android-env-vars.sh" >> /etc/bash.bashrc
 
 WORKDIR /home/cmbuild/android
 VOLUME /home/cmbuild/android
diff --git a/android-env-vars.sh b/android-env-vars.sh
new file mode 100644
index 0000000..84d65d2
--- /dev/null
+++ b/android-env-vars.sh
@@ -0,0 +1,2 @@
+export PATH=/home/cmbuild/bin:$PATH
+export USE_CCACHE=1