diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index d437ce8978..cac1023a32 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-8e44206d196617bc0913cac55899d5ba48a0f719
+f472b9622996e588403a7499313ab14fa3567ea0
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index a83fc08a95..ee9f981726 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-28T13-51-57
+  export IMAGE_VERSION=master-2021-06-07T22-22-51
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools