diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 10d0f37dab..cb0a5a0ac8 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "istio build-tools",
-  "image": "gcr.io/istio-testing/build-tools:master-17c2b235c898c60c83dccb2303cdd50067a6e58d",
+  "image": "gcr.io/istio-testing/build-tools:master-8946051100dffaf26dd813f2ce0bbc86c15f1086",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index d3dd170f8d..5b46c06810 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-e91f75f34a480702dffd492883c8dba9bbf7a9d7
+bb929efe369f9fa29f08fc0efff7b783fb70ae31
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 8cbcb54eed..0d3b6f0059 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
@@ -75,7 +77,7 @@ fi
 TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
 PROJECT_ID=${PROJECT_ID:-istio-testing}
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-17c2b235c898c60c83dccb2303cdd50067a6e58d
+  IMAGE_VERSION=master-8946051100dffaf26dd813f2ce0bbc86c15f1086
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools