diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index e9acd81c478..f01f58fec26 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-c704d86fd049026479a1e4249a0b7289e20f9b91
+3dc596da3a1c8852f3a92f964c39ef8db64a4dbf
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 1576bf31198..010b50fd108 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-07-01T20-30-56
+  export IMAGE_VERSION=master-2021-07-06T15-41-58
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools