diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 3136cfc463..1cbdb71853 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-461508da3271c9e23289e9d753c7c5dafe5444aa
+f280dd1587ae8f84b062f50c46b03be23251aad1
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index b38e08c7de..36eab5f336 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-12T17-40-14
+  export IMAGE_VERSION=master-2021-05-07T04-05-01
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools