diff --git a/Dockerfile b/Dockerfile
index c238644..c5d5570 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,10 +50,6 @@ COPY ssh_config /root/.ssh/config
 # considered to be ephemeral
 VOLUME ["/tmp/ccache", "/aosp"]
 
-# Improve rebuild performance by enabling compiler cache
-ENV USE_CCACHE 1
-ENV CCACHE_DIR /tmp/ccache
-
 # Work in the build directory, repo is expected to be init'd here
 WORKDIR /aosp
 
diff --git a/utils/docker_entrypoint.sh b/utils/docker_entrypoint.sh
index a607159..f40c609 100755
--- a/utils/docker_entrypoint.sh
+++ b/utils/docker_entrypoint.sh
@@ -17,6 +17,10 @@ set -e
 if [ -z ${USER_ID+x} ]; then USER_ID=1000; fi
 if [ -z ${GROUP_ID+x} ]; then GROUP_ID=1000; fi
 
+# ccache
+export CCACHE_DIR=/tmp/ccache
+export USE_CCACHE=1
+
 msg="docker_entrypoint: Creating user UID/GID [$USER_ID/$GROUP_ID]" && echo $msg
 groupadd -g $GROUP_ID -r aosp && \
 useradd -u $USER_ID --create-home -r -g aosp aosp