diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index d491110cf9e..fdb0b8e3c3e 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-637beaa6aae49d34a3e44dbb1add1e63f1eca320
+a20f94f052259a063e3fb07d88a61ec6e8ba707c
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 90f088b120e..bfabad953cb 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-05-25T19-20-02
+  export IMAGE_VERSION=master-2021-05-25T23-11-11
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools