diff --git a/.bazelversion b/.bazelversion
index 9f2e85218f6..09b254e90c6 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.0.0-pre.20220706.4
+6.0.0
diff --git a/WORKSPACE b/WORKSPACE
index d95fa1b8fbb..ce885cad873 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -38,10 +38,10 @@ bind(
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
 # Note: this is needed by release builder to resolve envoy dep sha to tag.
-# Commit date: 2022-12-07
-ENVOY_SHA = "141f28cf628b488304015eae861b81ada293c833"
+# Commit date: 2023-01-03
+ENVOY_SHA = "8349c8c5ae76c518cb940815ee9ebe133334b8ea"
 
-ENVOY_SHA256 = "11f28ab66d0cc69cf4d73b74b03579377039508870c1b378ebc270dd34a847fe"
+ENVOY_SHA256 = "b1e5562599b537dc135da5540ffbed4e1578f80db56a0b8fc6263835d542bbeb"
 
 ENVOY_ORG = "envoyproxy"
 
diff --git a/envoy.bazelrc b/envoy.bazelrc
index 240236de515..1b74671a64e 100644
--- a/envoy.bazelrc
+++ b/envoy.bazelrc
@@ -172,7 +172,7 @@ build:coverage --define=dynamic_link_tests=true
 build:coverage --define=ENVOY_CONFIG_COVERAGE=1
 build:coverage --cxxopt="-DENVOY_CONFIG_COVERAGE=1"
 build:coverage --coverage_support=@envoy//bazel/coverage:coverage_support
-build:coverage --test_env=CC_CODE_COVERAGE_SCRIPT=external/envoy/bazel/coverage/collect_cc_coverage.sh
+build:coverage --test_env=CC_CODE_COVERAGE_SCRIPT=bazel/coverage/collect_cc_coverage.sh
 build:coverage --test_env=HEAPCHECK=
 build:coverage --combined_report=lcov
 build:coverage --strategy=TestRunner=sandboxed,local
@@ -373,6 +373,7 @@ build:windows --define tcmalloc=disabled
 build:windows --define wasm=disabled
 build:windows --define manual_stamp=manual_stamp
 build:windows --cxxopt="/std:c++17"
+build:windows --output_groups=+pdb_file
 
 # TODO(wrowe,sunjayBhatia): Resolve bugs upstream in curl and rules_foreign_cc
 # See issue https://github.com/bazelbuild/rules_foreign_cc/issues/301