diff --git a/Dockerfile b/Dockerfile
index 37386baef40330060e186de4a338954a5851ee65..0676d4ea22c6af3627ba934b2f425c673659036a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Romain Hunault <romain.hunault@e.email>
 #######################
 
 ENV SRC_DIR /srv/src
-ENV CCACHE_DIR /srv/ccache
+ENV CCACHE_BASE_DIR /srv/ccache
 ENV ZIP_DIR /srv/zips
 ENV LMANIFEST_DIR /srv/local_manifests
 ENV KEYS_DIR /srv/keys
@@ -25,7 +25,7 @@ ENV USE_CCACHE 1
 # ccache maximum size. It should be a number followed by an optional suffix: k,
 # M, G, T (decimal), Ki, Mi, Gi or Ti (binary). The default suffix is G. Use 0
 # for no limit.
-ENV CCACHE_SIZE 50G
+ENV CCACHE_SIZE 100G
 
 # We need to specify the ccache binary since it is no longer packaged along with AOSP
 ENV CCACHE_EXEC /usr/bin/ccache
@@ -158,7 +158,7 @@ ENV REPO_CUSTOM_MANIFEST false
 # Create Volume entry points
 ############################
 VOLUME $SRC_DIR
-VOLUME $CCACHE_DIR
+VOLUME $CCACHE_BASE_DIR
 VOLUME $ZIP_DIR
 VOLUME $LMANIFEST_DIR
 VOLUME $KEYS_DIR
@@ -173,7 +173,7 @@ COPY src/ /root/
 # Create missing directories
 ############################
 RUN mkdir -p $SRC_DIR
-RUN mkdir -p $CCACHE_DIR
+RUN mkdir -p $CCACHE_BASE_DIR
 RUN mkdir -p $ZIP_DIR
 RUN mkdir -p $LMANIFEST_DIR
 RUN mkdir -p $KEYS_DIR
diff --git a/README.md b/README.md
index 677fda43e8ed5dd6bb4e10e3c90a302baa72ec4a..572c44fb0be3aaf85757d942843df601679b73c9 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ your builds with your own keys (**highly recommended**):
 
 Other useful settings are:
 
- * `CCACHE_SIZE (50G)`: change this if you want to give more (or less) space to
+ * `CCACHE_SIZE (100G)`: change this if you want to give more (or less) space to
     ccache
  * `WITH_SU (false)`: set to `true` to embed `su` in the build (note that, even
     when set to `false`, you can still enable root by flashing the
diff --git a/src/build.sh b/src/build.sh
index b8ce8b5fa7f9e41fa35fb9b52169cc46a611c892..c12979acfc2eeb911f8cfe50c2fa93b615d2deb2 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -132,6 +132,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
   mkdir -p "$SRC_DIR/$branch_dir"
   cd "$SRC_DIR/$branch_dir" || return 1
 
+  mkdir -p "$CCACHE_BASE_DIR/$branch_dir"
+  export CCACHE_DIR="$CCACHE_BASE_DIR/$branch_dir"
+
+  echo ">> [$(date)] Setting up CCache, CCACHE_DIR=${CCACHE_DIR} CCACHE_SIZE=${CCACHE_SIZE}"
+
   echo ">> [$(date)] Branch:  ${BRANCH_NAME}"
   echo ">> [$(date)] Device: ${DEVICE}"