diff --git a/test/distrib/cpp/run_distrib_test_cmake.sh b/test/distrib/cpp/run_distrib_test_cmake.sh
index d282d15ed14..031f26d385d 100755
--- a/test/distrib/cpp/run_distrib_test_cmake.sh
+++ b/test/distrib/cpp/run_distrib_test_cmake.sh
@@ -66,7 +66,8 @@ popd
 # Get list of submodules from the .gitmodules file since for running "git submodule foreach"
 # we'd need to be in a git workspace (and that's not the case when running
 # distribtests as a bazel action)
-grep 'path = ' .gitmodules | sed 's/^.*path = //' | xargs rm -rf
+# TODO(veblush): Remove upb exception
+grep 'path = ' .gitmodules | sed 's/^.*path = //' | grep -v 'third_party/upb' | xargs rm -rf
 
 # Install gRPC
 mkdir -p "cmake/build"
diff --git a/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh b/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
index 48e2a4d25e2..6ed7aea01e1 100755
--- a/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
+++ b/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh
@@ -70,7 +70,8 @@ popd
 # Get list of submodules from the .gitmodules file since for "git submodule foreach"
 # we'd need to be in a git workspace (and that's not the case when running
 # distribtests as a bazel action)
-grep 'path = ' .gitmodules | sed 's/^.*path = //' | xargs rm -rf
+# TODO(veblush): Remove upb exception
+grep 'path = ' .gitmodules | sed 's/^.*path = //' | grep -v 'third_party/upb' | xargs rm -rf
 
 # Install gRPC
 # TODO(jtattermusch): avoid the need for setting utf8_range_DIR
diff --git a/tools/bazel.rc b/tools/bazel.rc
index d32e9afb812..e2795a08791 100644
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@@ -12,6 +12,12 @@ build:macos   --host_cxxopt='-std=c++14'
 build:freebsd   --cxxopt='-std=c++14'
 build:freebsd   --host_cxxopt='-std=c++14'
 
+# TODO(veblush): Remove these once upb is upgraded to 25.x or later
+build:linux --copt=-Wno-typedef-redefinition
+build:linux --host_copt=-Wno-typedef-redefinition
+build:macos --copt=-Wno-typedef-redefinition
+build:macos --host_copt=-Wno-typedef-redefinition
+
 # Don't trigger --config=<host platform> when cross-compiling.
 build:android --noenable_platform_specific_config
 build:ios --noenable_platform_specific_config