diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 19ab1b2e29..4da3010e9e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "istio build-tools",
-  "image": "gcr.io/istio-testing/build-tools:release-1.26-80a1b41acf1fe5b60c2b49153f6d3f9ed3a82a0d",
+  "image": "gcr.io/istio-testing/build-tools:release-1.26-512a1e34a2bc63dd3c54ddcba27df1bcf95e7360",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 6ea5974b00..6a7569195d 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-3c071fd614ac519af1ca763cfe46521b7113b16c
+2a3998972172ea44d10217ac13cabfac18a47fff
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 95d4f99db3..04b201ce6d 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=release-1.26-80a1b41acf1fe5b60c2b49153f6d3f9ed3a82a0d
+  IMAGE_VERSION=release-1.26-512a1e34a2bc63dd3c54ddcba27df1bcf95e7360
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools
diff --git a/src/proxy.rs b/src/proxy.rs
index ef4f4e79af..a4878919b6 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -114,19 +114,15 @@ impl DefaultSocketFactory {
                 .with_time(cfg.keepalive_time)
                 .with_retries(cfg.keepalive_retries)
                 .with_interval(cfg.keepalive_interval);
-            tracing::trace!(
-                "set keepalive: {:?}",
-                socket2::SockRef::from(&s).set_tcp_keepalive(&ka)
-            );
+            let res = socket2::SockRef::from(&s).set_tcp_keepalive(&ka);
+            tracing::trace!("set keepalive: {:?}", res);
         }
         if cfg.user_timeout_enabled {
             // https://blog.cloudflare.com/when-tcp-sockets-refuse-to-die/
             // TCP_USER_TIMEOUT = TCP_KEEPIDLE + TCP_KEEPINTVL * TCP_KEEPCNT.
             let ut = cfg.keepalive_time + cfg.keepalive_retries * cfg.keepalive_interval;
-            tracing::trace!(
-                "set user timeout: {:?}",
-                socket2::SockRef::from(&s).set_tcp_user_timeout(Some(ut))
-            );
+            let res = socket2::SockRef::from(&s).set_tcp_user_timeout(Some(ut));
+            tracing::trace!("set user timeout: {:?}", res);
         }
         Ok(())
     }
diff --git a/src/socket.rs b/src/socket.rs
index 6acd222ffa..337f5b377c 100644
--- a/src/socket.rs
+++ b/src/socket.rs
@@ -175,17 +175,13 @@ impl Listener {
                     .with_time(cfg.keepalive_time)
                     .with_retries(cfg.keepalive_retries)
                     .with_interval(cfg.keepalive_interval);
-                tracing::trace!(
-                    "set keepalive: {:?}",
-                    SockRef::from(&stream).set_tcp_keepalive(&ka)
-                );
+                let res = SockRef::from(&stream).set_tcp_keepalive(&ka);
+                tracing::trace!("set keepalive: {:?}", res);
             }
             if cfg.user_timeout_enabled {
                 let ut = cfg.keepalive_time + cfg.keepalive_retries * cfg.keepalive_interval;
-                tracing::trace!(
-                    "set user timeout: {:?}",
-                    SockRef::from(&stream).set_tcp_user_timeout(Some(ut))
-                );
+                let res = SockRef::from(&stream).set_tcp_user_timeout(Some(ut));
+                tracing::trace!("set user timeout: {:?}", res);
             }
         }
         Ok((stream, remote))