diff --git a/.gitattributes b/.gitattributes
index eea5a1ec865..42f66802a6d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,5 @@
 *.gen.json linguist-generated=true
 *_pb2.py linguist-generated=true
 go.sum merge=union
+vendor/**  linguist-vendored
+common/**  linguist-vendored
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index b3ba53183aa..7a7f577133f 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-491344bc0de670df2b0d00520498256e687b4bf4
+239096c4f9d521f65ffa88f6999185ea1339f1d8
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 0cac131c96b..673868bf3db 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-e519cfe7cb31dd45c12b9420d81784dc54a87a53
+  IMAGE_VERSION=master-c8a7e42685e75ec46f4b389b06edf982bf231983
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools