diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 21ba68dcc6..e9acd81c47 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-837ab5479e70982c12028940cb7fa0168a52d55e
+c704d86fd049026479a1e4249a0b7289e20f9b91
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 2b1aafdebf..1576bf3119 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-28T18-08-04
+  export IMAGE_VERSION=master-2021-07-01T20-30-56
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools