diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index f98d2696acd..d8c5b34dfc9 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-b0040f15c13bdba0f3db56220b896f91545384e6
+4f26640e9970890fef722db08913d83af0708cfa
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 263d9042617..b38e08c7de2 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-04-06T17-14-07
+  export IMAGE_VERSION=master-2021-04-12T17-40-14
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools