diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 237189c9..5c5fca9b 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-30bf015b7dd0ab15b415d8a931642e27789924cd
+fcdeddae52d90817263f273954d0eb23456b4b7b
diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml
index 8ecaccf1..0fa3db32 100644
--- a/common/config/.golangci.yml
+++ b/common/config/.golangci.yml
@@ -7,7 +7,7 @@
 
 service:
   # When updating this, also update the version stored in docker/build-tools/Dockerfile in the istio/tools repo.
-  golangci-lint-version: 1.52.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.53.x # use the fixed version to not introduce new linters unexpectedly
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
   deadline: 20m
@@ -231,6 +231,15 @@ linters-settings:
       # - unnamedResult
       # - wrapperFunc
   depguard:
+    # configuration for depguard v2
+    rules:
+      DenyGogoProtobuf:
+        files:
+          - $all
+        deny:
+          - pkg: github.com/gogo/protobuf
+            desc: "gogo/protobuf is deprecated, use golang/protobuf"
+    # configuration for depguard
     packages-with-error-message:
       - github.com/gogo/protobuf: "gogo/protobuf is deprecated, use golang/protobuf"
   gosec:
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index c4ef4878..cdeef4e6 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -75,7 +75,7 @@ fi
 TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
 PROJECT_ID=${PROJECT_ID:-istio-testing}
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-62f8b507af660ecccb613e643daf5ea546222ac7
+  IMAGE_VERSION=master-8fd7512ff351aebc342a7c6410dd4899811de4ef
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools