diff --git a/envoy b/envoy
index 3883622154..bf0a16a0b8 160000
--- a/envoy
+++ b/envoy
@@ -1 +1 @@
-Subproject commit 3883622154935e4ad03c1f571ea4277151616334
+Subproject commit bf0a16a0b84eeb5af4a8b5a99cf9cea46c1c8daf
diff --git a/envoy_build_config/extensions_build_config.bzl b/envoy_build_config/extensions_build_config.bzl
index 08ed115771..cfbb5b0a28 100644
--- a/envoy_build_config/extensions_build_config.bzl
+++ b/envoy_build_config/extensions_build_config.bzl
@@ -1,5 +1,7 @@
 EXTENSION_CONFIG_VISIBILITY = ["//visibility:public"]
 EXTENSION_PACKAGE_VISIBILITY = ["//visibility:public"]
+CONTRIB_EXTENSION_PACKAGE_VISIBILITY = ["//visibility:public"]
+
 EXTENSIONS = {
     "envoy.clusters.dynamic_forward_proxy":                "//source/extensions/clusters/dynamic_forward_proxy:cluster",
     "envoy.filters.connection_pools.http.generic":         "//source/extensions/upstreams/http/generic:config",