diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index aee66d9893f..b22f3d45f11 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-ac4cf14054d8c06b553e5f282e453bdff21dcd5d
+9fee69af7545adadbaa2706f78fb91dcf7cf5202
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 302109b53a5..eedd8b49b21 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -73,7 +73,7 @@ fi
 
 # Build image to use
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-5476a2a447736be89da74102c1c67ebbd6918b5a
+  IMAGE_VERSION=master-65b95c3425a26e633081b2d0834cc0df6e81fd8a
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools