diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index ed91af5c64..3a8de547bf 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-860896762e27e299e460047559425f6105127aa0
+91b5cfd2c2fe98f09c412ea0ee622bcf86fabc01
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 2d1aedfa95..43c1eaed60 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-31f6ab09d9f2cdbdc8ac1e6226991494f94392fa
+  IMAGE_VERSION=master-3afabd07236f0f9b641d7a8249a664a3a4fc9ed8
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools