diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index cac1023a32c..af2775c0ca8 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-f472b9622996e588403a7499313ab14fa3567ea0
+fb78761c734f26dc35a59e115b792b10e49f1232
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index ee9f9817267..64e82e14c1e 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -63,7 +63,7 @@ fi
 
 # Build image to use
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  export IMAGE_VERSION=master-2021-06-07T22-22-51
+  export IMAGE_VERSION=master-2021-06-15T16-37-30
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools