diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 6b6363ac650..aee66d9893f 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-cbb37d1d13a5de0456f7c1a4d6aad0ce52d405e1
+ac4cf14054d8c06b553e5f282e453bdff21dcd5d
diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml
index 62288b59968..426b10bf68b 100644
--- a/common/config/.golangci.yml
+++ b/common/config/.golangci.yml
@@ -237,6 +237,7 @@ linters-settings:
   depguard:
     packages-with-error-message:
     - github.com/gogo/protobuf: "gogo/protobuf is deprecated, use golang/protobuf"
+    - golang.org/x/net/http2/h2c: "h2c.NewHandler is unsafe; use wrapper istio.io/istio/pkg/h2c"
 issues:
   # List of regexps of issue texts to exclude, empty list by default.
   # But independently from this option we use default exclude patterns,
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 6166c0fa634..302109b53a5 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-d9e298f7cf9bb76b7f5dd9f18367725b05ad626b
+  IMAGE_VERSION=master-5476a2a447736be89da74102c1c67ebbd6918b5a
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools