diff --git a/.bazelrc b/.bazelrc
index a10ad12060..c266ffda80 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -19,3 +19,6 @@ common:tsan --copt -fsanitize=thread
 common:tsan --copt -DTHREAD_SANITIZER
 common:tsan --linkopt -fsanitize=thread
 common:tsan --cc_output_directory_tag=tsan
+# This is needed to address false positive problem with abseil.The same setting as gRPC
+# https://github.com/google/sanitizers/issues/953
+common:tsan --test_env=TSAN_OPTIONS=report_atomic_races=0
\ No newline at end of file
diff --git a/WORKSPACE b/WORKSPACE
index e1041d37dd..1bd7b57c39 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -29,9 +29,9 @@ load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
 
 grpc_extra_deps()
 
-load("@upb//bazel:repository_defs.bzl", "bazel_version_repository")
+load("@upb//bazel:workspace_deps.bzl", "upb_deps")
 
-bazel_version_repository(name = "upb_bazel_version")
+upb_deps()
 
 # Load prometheus C++ dependencies.
 load("@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl", "prometheus_cpp_repositories")
diff --git a/bazel/repository.bzl b/bazel/repository.bzl
index 59ed8b1ada..76a258ff30 100644
--- a/bazel/repository.bzl
+++ b/bazel/repository.bzl
@@ -32,10 +32,10 @@ def opentelemetry_cpp_deps():
     maybe(
         http_archive,
         name = "com_github_grpc_grpc",
-        sha256 = "d6277f77e0bb922d3f6f56c0f93292bb4cfabfc3c92b31ee5ccea0e100303612",
-        strip_prefix = "grpc-1.28.0",
+        sha256 = "abd9e52c69000f2c051761cfa1f12d52d8b7647b6c66828a91d462e796f2aede",
+        strip_prefix = "grpc-1.38.0",
         urls = [
-            "https://github.com/grpc/grpc/archive/v1.28.0.tar.gz",
+            "https://github.com/grpc/grpc/archive/v1.38.0.tar.gz",
         ],
     )
 
diff --git a/ci/do_ci.sh b/ci/do_ci.sh
index c78024a04f..b77b186222 100755
--- a/ci/do_ci.sh
+++ b/ci/do_ci.sh
@@ -121,8 +121,8 @@ elif [[ "$1" == "bazel.test" ]]; then
 elif [[ "$1" == "bazel.legacy.test" ]]; then
   # we uses C++ future and async() function to test the Prometheus Exporter functionality,
   # that make this test always fail. ignore Prometheus exporter here.
-  bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS -- //... -//exporters/otlp/... -//exporters/prometheus/...
-  bazel $BAZEL_STARTUP_OPTIONS test $BAZEL_TEST_OPTIONS -- //... -//exporters/otlp/... -//exporters/prometheus/...
+  bazel $BAZEL_STARTUP_OPTIONS build --cxxopt="-std=c++11" --conlyopt="-std=c99" $BAZEL_OPTIONS -- //... -//exporters/otlp/... -//exporters/prometheus/...
+  bazel $BAZEL_STARTUP_OPTIONS test --cxxopt="-std=c++11" --conlyopt="-std=c99" $BAZEL_TEST_OPTIONS -- //... -//exporters/otlp/... -//exporters/prometheus/...
   exit 0
 elif [[ "$1" == "bazel.noexcept" ]]; then
   # there are some exceptions and error handling code from the Prometheus Client
diff --git a/ci/setup_grpc.sh b/ci/setup_grpc.sh
index 98780bb943..1f6caf1ff3 100755
--- a/ci/setup_grpc.sh
+++ b/ci/setup_grpc.sh
@@ -13,7 +13,7 @@ fi
 export BUILD_DIR=/tmp/
 export INSTALL_DIR=/usr/local/
 pushd $BUILD_DIR
-git clone --depth=1 -b v1.34.0 https://github.com/grpc/grpc
+git clone --depth=1 -b v1.38.0 https://github.com/grpc/grpc
 cd grpc
 git submodule init
 git submodule update --depth 1