diff --git a/envoy/api/v2/auth/cert.proto b/envoy/api/v2/auth/cert.proto
index 1710b57f..ebf199a4 100644
--- a/envoy/api/v2/auth/cert.proto
+++ b/envoy/api/v2/auth/cert.proto
@@ -382,7 +382,6 @@ message DownstreamTlsContext {
   }
 }
 
-// [#proto-status: experimental]
 message SdsSecretConfig {
   // Name (FQDN, UUID, SPKI, SHA256, etc.) by which the secret can be uniquely referred to.
   // When both name and config are specified, then secret can be fetched and/or reloaded via SDS.
@@ -393,7 +392,6 @@ message SdsSecretConfig {
   core.ConfigSource sds_config = 2;
 }
 
-// [#proto-status: experimental]
 message Secret {
   // Name (FQDN, UUID, SPKI, SHA256, etc.) by which the secret can be uniquely referred to.
   string name = 1;
diff --git a/envoy/api/v2/cds.proto b/envoy/api/v2/cds.proto
index bd030b90..cbd0eea5 100644
--- a/envoy/api/v2/cds.proto
+++ b/envoy/api/v2/cds.proto
@@ -799,8 +799,6 @@ message Cluster {
 //
 // To facilitate this, the config message for the top-level LB policy may include a field of
 // type LoadBalancingPolicy that specifies the child policy.
-//
-// [#proto-status: experimental]
 message LoadBalancingPolicy {
   message Policy {
     // Required. The name of the LB policy.
diff --git a/envoy/api/v2/core/grpc_service.proto b/envoy/api/v2/core/grpc_service.proto
index acd86c36..cbe6c829 100644
--- a/envoy/api/v2/core/grpc_service.proto
+++ b/envoy/api/v2/core/grpc_service.proto
@@ -27,7 +27,6 @@ message GrpcService {
     string cluster_name = 1 [(validate.rules).string = {min_bytes: 1}];
   }
 
-  // [#proto-status: draft]
   message GoogleGrpc {
     // See https://grpc.io/grpc/cpp/structgrpc_1_1_ssl_credentials_options.html.
     message SslCredentials {
diff --git a/envoy/api/v2/srds.proto b/envoy/api/v2/srds.proto
index 0d74594c..224ae070 100644
--- a/envoy/api/v2/srds.proto
+++ b/envoy/api/v2/srds.proto
@@ -23,7 +23,6 @@ import "validate/validate.proto";
 // dynamically assign a routing table (specified via a
 // :ref:`RouteConfiguration<envoy_api_msg_RouteConfiguration>` message) to each
 // HTTP request.
-// [#proto-status: experimental]
 service ScopedRoutesDiscoveryService {
   rpc StreamScopedRoutes(stream DiscoveryRequest) returns (stream DiscoveryResponse) {
   }
@@ -99,7 +98,6 @@ service ScopedRoutesDiscoveryService {
 // RouteConfiguration being assigned to the HTTP request/stream.
 //
 // [#comment:next free field: 4]
-// [#proto-status: experimental]
 message ScopedRouteConfiguration {
   // Specifies a key which is matched against the output of the
   // :ref:`scope_key_builder<envoy_api_field_config.filter.network.http_connection_manager.v2.ScopedRoutes.scope_key_builder>`
diff --git a/envoy/api/v3alpha/auth/cert.proto b/envoy/api/v3alpha/auth/cert.proto
index 39596e01..4b594ae0 100644
--- a/envoy/api/v3alpha/auth/cert.proto
+++ b/envoy/api/v3alpha/auth/cert.proto
@@ -382,7 +382,6 @@ message DownstreamTlsContext {
   }
 }
 
-// [#proto-status: experimental]
 message SdsSecretConfig {
   // Name (FQDN, UUID, SPKI, SHA256, etc.) by which the secret can be uniquely referred to.
   // When both name and config are specified, then secret can be fetched and/or reloaded via SDS.
@@ -393,7 +392,6 @@ message SdsSecretConfig {
   core.ConfigSource sds_config = 2;
 }
 
-// [#proto-status: experimental]
 message Secret {
   // Name (FQDN, UUID, SPKI, SHA256, etc.) by which the secret can be uniquely referred to.
   string name = 1;
diff --git a/envoy/api/v3alpha/cds.proto b/envoy/api/v3alpha/cds.proto
index eae8b578..adae481c 100644
--- a/envoy/api/v3alpha/cds.proto
+++ b/envoy/api/v3alpha/cds.proto
@@ -793,8 +793,6 @@ message Cluster {
 //
 // To facilitate this, the config message for the top-level LB policy may include a field of
 // type LoadBalancingPolicy that specifies the child policy.
-//
-// [#proto-status: experimental]
 message LoadBalancingPolicy {
   message Policy {
     // Required. The name of the LB policy.
diff --git a/envoy/api/v3alpha/core/grpc_service.proto b/envoy/api/v3alpha/core/grpc_service.proto
index a4c2d66f..53c4e5db 100644
--- a/envoy/api/v3alpha/core/grpc_service.proto
+++ b/envoy/api/v3alpha/core/grpc_service.proto
@@ -27,7 +27,6 @@ message GrpcService {
     string cluster_name = 1 [(validate.rules).string = {min_bytes: 1}];
   }
 
-  // [#proto-status: draft]
   message GoogleGrpc {
     // See https://grpc.io/grpc/cpp/structgrpc_1_1_ssl_credentials_options.html.
     message SslCredentials {
diff --git a/envoy/api/v3alpha/srds.proto b/envoy/api/v3alpha/srds.proto
index 63195aaf..7ff674bc 100644
--- a/envoy/api/v3alpha/srds.proto
+++ b/envoy/api/v3alpha/srds.proto
@@ -23,7 +23,6 @@ import "validate/validate.proto";
 // dynamically assign a routing table (specified via a
 // :ref:`RouteConfiguration<envoy_api_msg_RouteConfiguration>` message) to each
 // HTTP request.
-// [#proto-status: experimental]
 service ScopedRoutesDiscoveryService {
   rpc StreamScopedRoutes(stream DiscoveryRequest) returns (stream DiscoveryResponse) {
   }
@@ -99,7 +98,6 @@ service ScopedRoutesDiscoveryService {
 // RouteConfiguration being assigned to the HTTP request/stream.
 //
 // [#comment:next free field: 4]
-// [#proto-status: experimental]
 message ScopedRouteConfiguration {
   // Specifies a key which is matched against the output of the
   // :ref:`scope_key_builder<envoy_api_field_config.filter.network.http_connection_manager.v3alpha.ScopedRoutes.scope_key_builder>`
diff --git a/envoy/config/filter/http/original_src/v2alpha1/original_src.proto b/envoy/config/filter/http/original_src/v2alpha1/original_src.proto
index e2de31ea..b5927ed0 100644
--- a/envoy/config/filter/http/original_src/v2alpha1/original_src.proto
+++ b/envoy/config/filter/http/original_src/v2alpha1/original_src.proto
@@ -18,6 +18,5 @@ message OriginalSrc {
   // Sets the SO_MARK option on the upstream connection's socket to the provided value. Used to
   // ensure that non-local addresses may be routed back through envoy when binding to the original
   // source address. The option will not be applied if the mark is 0.
-  // [#proto-status: experimental]
   uint32 mark = 1;
 }
diff --git a/envoy/config/filter/http/original_src/v3alpha/original_src.proto b/envoy/config/filter/http/original_src/v3alpha/original_src.proto
index b4ac0a19..b3e9d95f 100644
--- a/envoy/config/filter/http/original_src/v3alpha/original_src.proto
+++ b/envoy/config/filter/http/original_src/v3alpha/original_src.proto
@@ -18,6 +18,5 @@ message OriginalSrc {
   // Sets the SO_MARK option on the upstream connection's socket to the provided value. Used to
   // ensure that non-local addresses may be routed back through envoy when binding to the original
   // source address. The option will not be applied if the mark is 0.
-  // [#proto-status: experimental]
   uint32 mark = 1;
 }
diff --git a/envoy/config/filter/http/squash/v2/squash.proto b/envoy/config/filter/http/squash/v2/squash.proto
index e75ee5d6..aa61a486 100644
--- a/envoy/config/filter/http/squash/v2/squash.proto
+++ b/envoy/config/filter/http/squash/v2/squash.proto
@@ -14,7 +14,6 @@ import "validate/validate.proto";
 // [#protodoc-title: Squash]
 // Squash :ref:`configuration overview <config_http_filters_squash>`.
 
-// [#proto-status: experimental]
 message Squash {
   // The name of the cluster that hosts the Squash server.
   string cluster = 1 [(validate.rules).string = {min_bytes: 1}];
diff --git a/envoy/config/filter/http/squash/v3alpha/squash.proto b/envoy/config/filter/http/squash/v3alpha/squash.proto
index 432224ec..c18b0658 100644
--- a/envoy/config/filter/http/squash/v3alpha/squash.proto
+++ b/envoy/config/filter/http/squash/v3alpha/squash.proto
@@ -14,7 +14,6 @@ import "validate/validate.proto";
 // [#protodoc-title: Squash]
 // Squash :ref:`configuration overview <config_http_filters_squash>`.
 
-// [#proto-status: experimental]
 message Squash {
   // The name of the cluster that hosts the Squash server.
   string cluster = 1 [(validate.rules).string = {min_bytes: 1}];
diff --git a/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto b/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto
index e939e2d8..a9d8fb93 100644
--- a/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto
+++ b/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto
@@ -16,12 +16,11 @@ import "validate/validate.proto";
 // could come from trusted http headers.
 message OriginalSrc {
   // Whether to bind the port to the one used in the original downstream connection.
-  // [#not-implemented-warn:]
+  // [#not-implemented-hide:]
   bool bind_port = 1;
 
   // Sets the SO_MARK option on the upstream connection's socket to the provided value. Used to
   // ensure that non-local addresses may be routed back through envoy when binding to the original
   // source address. The option will not be applied if the mark is 0.
-  // [#proto-status: experimental]
   uint32 mark = 2;
 }
diff --git a/envoy/config/filter/listener/original_src/v3alpha/original_src.proto b/envoy/config/filter/listener/original_src/v3alpha/original_src.proto
index b934607d..8f6e68b6 100644
--- a/envoy/config/filter/listener/original_src/v3alpha/original_src.proto
+++ b/envoy/config/filter/listener/original_src/v3alpha/original_src.proto
@@ -16,12 +16,11 @@ import "validate/validate.proto";
 // could come from trusted http headers.
 message OriginalSrc {
   // Whether to bind the port to the one used in the original downstream connection.
-  // [#not-implemented-warn:]
+  // [#not-implemented-hide:]
   bool bind_port = 1;
 
   // Sets the SO_MARK option on the upstream connection's socket to the provided value. Used to
   // ensure that non-local addresses may be routed back through envoy when binding to the original
   // source address. The option will not be applied if the mark is 0.
-  // [#proto-status: experimental]
   uint32 mark = 2;
 }
diff --git a/envoy/config/trace/v2/trace.proto b/envoy/config/trace/v2/trace.proto
index f651dc3d..1fad6beb 100644
--- a/envoy/config/trace/v2/trace.proto
+++ b/envoy/config/trace/v2/trace.proto
@@ -134,7 +134,6 @@ message DatadogConfig {
 }
 
 // Configuration for the OpenCensus tracer.
-// [#proto-status: experimental]
 message OpenCensusConfig {
   enum TraceContext {
     // No-op default, no trace context is utilized.
diff --git a/envoy/config/trace/v3alpha/trace.proto b/envoy/config/trace/v3alpha/trace.proto
index f448e913..238a6ad6 100644
--- a/envoy/config/trace/v3alpha/trace.proto
+++ b/envoy/config/trace/v3alpha/trace.proto
@@ -134,7 +134,6 @@ message DatadogConfig {
 }
 
 // Configuration for the OpenCensus tracer.
-// [#proto-status: experimental]
 message OpenCensusConfig {
   enum TraceContext {
     // No-op default, no trace context is utilized.
diff --git a/envoy/service/discovery/v2/hds.proto b/envoy/service/discovery/v2/hds.proto
index 354dae94..d1136831 100644
--- a/envoy/service/discovery/v2/hds.proto
+++ b/envoy/service/discovery/v2/hds.proto
@@ -15,7 +15,6 @@ import "envoy/api/v2/endpoint/endpoint.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/duration.proto";
 
-// [#proto-status: experimental]
 // HDS is Health Discovery Service. It compliments Envoy’s health checking
 // service by designating this Envoy to be a healthchecker for a subset of hosts
 // in the cluster. The status of these health checks will be reported to the
diff --git a/envoy/service/discovery/v3alpha/hds.proto b/envoy/service/discovery/v3alpha/hds.proto
index 14955b15..31c0cc77 100644
--- a/envoy/service/discovery/v3alpha/hds.proto
+++ b/envoy/service/discovery/v3alpha/hds.proto
@@ -15,7 +15,6 @@ import "envoy/api/v3alpha/endpoint/endpoint.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/duration.proto";
 
-// [#proto-status: experimental]
 // HDS is Health Discovery Service. It compliments Envoy’s health checking
 // service by designating this Envoy to be a healthchecker for a subset of hosts
 // in the cluster. The status of these health checks will be reported to the
diff --git a/envoy/service/trace/v2/trace_service.proto b/envoy/service/trace/v2/trace_service.proto
index 92b8489f..0b376138 100644
--- a/envoy/service/trace/v2/trace_service.proto
+++ b/envoy/service/trace/v2/trace_service.proto
@@ -1,7 +1,5 @@
 syntax = "proto3";
 
-// [#proto-status: draft]
-
 package envoy.service.trace.v2;
 
 option java_outer_classname = "TraceServiceProto";
diff --git a/envoy/service/trace/v3alpha/trace_service.proto b/envoy/service/trace/v3alpha/trace_service.proto
index b6559800..8c866848 100644
--- a/envoy/service/trace/v3alpha/trace_service.proto
+++ b/envoy/service/trace/v3alpha/trace_service.proto
@@ -1,7 +1,5 @@
 syntax = "proto3";
 
-// [#proto-status: draft]
-
 package envoy.service.trace.v3alpha;
 
 option java_outer_classname = "TraceServiceProto";