diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 83a4fb192c..0e5dc3d301 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-e47fa06d81ebb0cdc2dc9fb1e6d6feaec3bb2fed
+baed413909f2aea915cb0c0d8e6f304d9056f2a4
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 67c63c3fab..f6be0c4258 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -73,7 +73,7 @@ fi
 
 # Build image to use
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-2022-03-17T19-05-13
+  IMAGE_VERSION=master-2022-03-21T17-16-23
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools