diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 86b22ae2776..283ea7ce256 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-f225847dc2f900e4ecd1a6232237c07c5ef6325e
+f8cc57515926234552519fb8543d52a44d6f9d21
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 1cd9481d87d..ea75c938cd2 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-03-15T07-16-03
+  export IMAGE_VERSION=master-2021-04-02T23-15-48
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools