diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ead0214c8a..d701f35b85 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.22-92c196173fa394c372932ee8cbf802ccb3fa957e",
+  "image": "registry.cn-hangzhou.aliyuncs.com/riscv64_hzc/istio-build_tools:v1.22.2-20241015",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/Makefile b/Makefile
index 402171d275..2b1c4ac289 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 SHELL := /bin/bash
 
 # allow optional per-repo overrides
--include Makefile.overrides.mk
+#-include Makefile.overrides.mk
 
 # Set the environment variable BUILD_WITH_CONTAINER to use a container
 # to build the repo. The only dependencies in this mode are to have make and
diff --git a/Makefile.core.mk b/Makefile.core.mk
index a66112cfa1..92192830f9 100644
--- a/Makefile.core.mk
+++ b/Makefile.core.mk
@@ -452,7 +452,7 @@ BENCH_TARGETS ?= ./pilot/...
 PKG ?= ./...
 .PHONY: racetest
 racetest: $(JUNIT_REPORT)
-	go test ${GOBUILDFLAGS} ${T} -race $(PKG) 2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))
+	go test ${GOBUILDFLAGS} ${T}  $(PKG) 2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_OUT))
 
 .PHONY: benchtest
 benchtest: $(JUNIT_REPORT) ## Runs all benchmarks
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index adc1ba26ee..181493d036 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -49,6 +49,8 @@ elif [[ ${LOCAL_ARCH} == s390x ]]; then
     TARGET_ARCH=s390x
 elif [[ ${LOCAL_ARCH} == ppc64le ]]; then
     TARGET_ARCH=ppc64le
+elif [[ ${LOCAL_ARCH} == riscv64 ]]; then
+    TARGET_ARCH=riscv64
 else
     echo "This system's architecture, ${LOCAL_ARCH}, isn't supported"
     exit 1
@@ -91,7 +93,8 @@ TARGET_OUT_LINUX="${TARGET_OUT_LINUX:-$(pwd)/out/linux_${TARGET_ARCH}}"
 CONTAINER_TARGET_OUT="${CONTAINER_TARGET_OUT:-/work/out/${TARGET_OS}_${TARGET_ARCH}}"
 CONTAINER_TARGET_OUT_LINUX="${CONTAINER_TARGET_OUT_LINUX:-/work/out/linux_${TARGET_ARCH}}"
 
-IMG="${IMG:-${TOOLS_REGISTRY_PROVIDER}/${PROJECT_ID}/${IMAGE_NAME}:${IMAGE_VERSION}}"
+IMG=registry.cn-hangzhou.aliyuncs.com/riscv64_hzc/istio-build_tools:v1.22.2-20241015
+#IMG="${IMG:-${TOOLS_REGISTRY_PROVIDER}/${PROJECT_ID}/${IMAGE_NAME}:${IMAGE_VERSION}}"
 
 CONTAINER_CLI="${CONTAINER_CLI:-docker}"
 
diff --git a/istio.deps b/istio.deps
index 8943a20661..eff27fcf1b 100644
--- a/istio.deps
+++ b/istio.deps
@@ -4,13 +4,13 @@
     "name": "PROXY_REPO_SHA",
     "repoName": "proxy",
     "file": "",
-    "lastStableSHA": "89dab8c451aad8c979c1a135184a9669cc4da071"
+    "lastStableSHA": "7128178afa45de544e24e4fdca09d843722dc6c4"
   },
   {
     "_comment": "",
     "name": "ZTUNNEL_REPO_SHA",
     "repoName": "ztunnel",
     "file": "",
-    "lastStableSHA": "085565a89e7486a5c445f83629d39fb784731155"
+    "lastStableSHA": "f4b08df49086e3d2671222f00c0da92190e8cfd8"
   }
 ]