diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index af2775c0ca8..7be2374c292 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-fb78761c734f26dc35a59e115b792b10e49f1232
+c5caf149b36e669d991e6ad5b0838bb22fa5d4e5
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 64e82e14c1e..f1a4a6bd2c0 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-15T16-37-30
+  export IMAGE_VERSION=master-2021-06-16T23-16-54
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools