diff --git a/docker/cloudbuild.yaml b/docker/cloudbuild.yaml
index 565aa07..0145e7d 100644
--- a/docker/cloudbuild.yaml
+++ b/docker/cloudbuild.yaml
@@ -8,8 +8,8 @@
   #
   # Where COMMIT_SHA is updated to the last commit into Skia.
   #
-  #- name: 'gcr.io/cloud-builders/git'
-  #  args: ['clone', 'https://github.com/google/skia.git', '.']
+  # - name: 'gcr.io/cloud-builders/git'
+  #   args: ['clone', 'https://github.com/google/skia.git', '.']
 
   - name: 'debian:testing-slim'
     args: ['mkdir', '-p', '--mode=0777', '/workspace/__doxygen_staging']
@@ -144,5 +144,4 @@
 options:
   machineType: 'N1_HIGHCPU_32'
   env: # https://bugs.chromium.org/p/chromium/issues/detail?id=993053#c3
-    - 'VPYTHON_VIRTUALENV_ROOT=/workspace/__cache'
-    - 'CIPD_CACHE_DIR=/workspace/__cache'
+    - 'HOME=/tmp'
diff --git a/docker/skia-release/Dockerfile b/docker/skia-release/Dockerfile
index 952e959..c148fca 100644
--- a/docker/skia-release/Dockerfile
+++ b/docker/skia-release/Dockerfile
@@ -9,7 +9,7 @@
   libgl1-mesa-dev \
   libglu1-mesa-dev \
   && groupadd -g 2000 skia \
-  && useradd -u 2000 -g 2000 --home-dir /workspace/__cache skia
+  && useradd -u 2000 -g 2000 --home-dir /tmp skia
 
 USER skia