diff --git a/envoy/api/v2/cds.proto b/envoy/api/v2/cds.proto
index 206704eb..96587ae2 100644
--- a/envoy/api/v2/cds.proto
+++ b/envoy/api/v2/cds.proto
@@ -30,6 +30,7 @@ import "validate/validate.proto";
 import "gogoproto/gogo.proto";
 
 option (gogoproto.equal_all) = true;
+option (gogoproto.stable_marshaler_all) = true;
 
 // Return list of all clusters this proxy will load balance to.
 service ClusterDiscoveryService {
diff --git a/envoy/api/v2/core/base.proto b/envoy/api/v2/core/base.proto
index a1134948..07161c5a 100644
--- a/envoy/api/v2/core/base.proto
+++ b/envoy/api/v2/core/base.proto
@@ -17,6 +17,7 @@ import "gogoproto/gogo.proto";
 import "envoy/type/percent.proto";
 
 option (gogoproto.equal_all) = true;
+option (gogoproto.stable_marshaler_all) = true;
 
 // [#protodoc-title: Common types]
 
diff --git a/envoy/api/v2/discovery.proto b/envoy/api/v2/discovery.proto
index 5bff0dda..c2f74a43 100644
--- a/envoy/api/v2/discovery.proto
+++ b/envoy/api/v2/discovery.proto
@@ -14,6 +14,7 @@ import "google/rpc/status.proto";
 import "gogoproto/gogo.proto";
 
 option (gogoproto.equal_all) = true;
+option (gogoproto.stable_marshaler_all) = true;
 
 // [#protodoc-title: Common discovery API components]
 
diff --git a/envoy/api/v2/eds.proto b/envoy/api/v2/eds.proto
index fcef8c5f..6a687ce9 100644
--- a/envoy/api/v2/eds.proto
+++ b/envoy/api/v2/eds.proto
@@ -19,6 +19,7 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/wrappers.proto";
 
 option (gogoproto.equal_all) = true;
+option (gogoproto.stable_marshaler_all) = true;
 
 // [#protodoc-title: EDS]
 // Endpoint discovery :ref:`architecture overview <arch_overview_service_discovery_types_eds>`
diff --git a/envoy/api/v2/route/route.proto b/envoy/api/v2/route/route.proto
index 3cbf7268..874f42e7 100644
--- a/envoy/api/v2/route/route.proto
+++ b/envoy/api/v2/route/route.proto
@@ -21,6 +21,7 @@ import "validate/validate.proto";
 import "gogoproto/gogo.proto";
 
 option (gogoproto.equal_all) = true;
+option (gogoproto.stable_marshaler_all) = true;
 
 // [#protodoc-title: HTTP route]
 // * Routing :ref:`architecture overview <arch_overview_http_routing>`
diff --git a/envoy/config/filter/http/ext_authz/v2/ext_authz.proto b/envoy/config/filter/http/ext_authz/v2/ext_authz.proto
index 7a5ca47f..e79e5986 100644
--- a/envoy/config/filter/http/ext_authz/v2/ext_authz.proto
+++ b/envoy/config/filter/http/ext_authz/v2/ext_authz.proto
@@ -14,6 +14,9 @@ import "envoy/api/v2/core/http_uri.proto";
 import "envoy/type/matcher/string.proto";
 
 import "validate/validate.proto";
+import "gogoproto/gogo.proto";
+
+option (gogoproto.stable_marshaler_all) = true;
 
 // [#protodoc-title: External Authorization]
 // External Authorization :ref:`configuration overview <config_http_filters_ext_authz>`.
diff --git a/envoy/config/filter/http/health_check/v2/health_check.proto b/envoy/config/filter/http/health_check/v2/health_check.proto
index 2eeb2692..bc843373 100644
--- a/envoy/config/filter/http/health_check/v2/health_check.proto
+++ b/envoy/config/filter/http/health_check/v2/health_check.proto
@@ -16,6 +16,8 @@ import "envoy/type/percent.proto";
 import "validate/validate.proto";
 import "gogoproto/gogo.proto";
 
+option (gogoproto.stable_marshaler_all) = true;
+
 // [#protodoc-title: Health check]
 // Health check :ref:`configuration overview <config_http_filters_health_check>`.
 
diff --git a/envoy/config/filter/http/jwt_authn/v2alpha/config.proto b/envoy/config/filter/http/jwt_authn/v2alpha/config.proto
index 55596052..adb44619 100644
--- a/envoy/config/filter/http/jwt_authn/v2alpha/config.proto
+++ b/envoy/config/filter/http/jwt_authn/v2alpha/config.proto
@@ -14,6 +14,9 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/wrappers.proto";
 import "validate/validate.proto";
+import "gogoproto/gogo.proto";
+
+option (gogoproto.stable_marshaler_all) = true;
 
 // [#protodoc-title: JWT Authentication]
 // JWT Authentication :ref:`configuration overview <config_http_filters_jwt_authn>`.
diff --git a/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto b/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto
index 2c3d80ae..bc5f6825 100644
--- a/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto
+++ b/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto
@@ -16,6 +16,8 @@ import "google/protobuf/wrappers.proto";
 import "validate/validate.proto";
 import "gogoproto/gogo.proto";
 
+option (gogoproto.stable_marshaler_all) = true;
+
 // [#protodoc-title: Dubbo route configuration]
 
 message RouteConfiguration {
diff --git a/envoy/config/rbac/v2alpha/rbac.proto b/envoy/config/rbac/v2alpha/rbac.proto
index 19b61473..9d3c2e72 100644
--- a/envoy/config/rbac/v2alpha/rbac.proto
+++ b/envoy/config/rbac/v2alpha/rbac.proto
@@ -1,6 +1,7 @@
 syntax = "proto3";
 
 import "validate/validate.proto";
+import "gogoproto/gogo.proto";
 import "envoy/api/v2/core/address.proto";
 import "envoy/api/v2/route/route.proto";
 import "envoy/type/matcher/metadata.proto";
@@ -13,6 +14,8 @@ option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.rbac.v2alpha";
 option go_package = "v2alpha";
 
+option (gogoproto.stable_marshaler_all) = true;
+
 // [#protodoc-title: Role Based Access Control (RBAC)]
 
 // Role Based Access Control (RBAC) provides service-level and method-level access control for a
diff --git a/envoy/data/accesslog/v2/accesslog.proto b/envoy/data/accesslog/v2/accesslog.proto
index 5119365b..985758bb 100644
--- a/envoy/data/accesslog/v2/accesslog.proto
+++ b/envoy/data/accesslog/v2/accesslog.proto
@@ -15,6 +15,8 @@ import "google/protobuf/wrappers.proto";
 import "gogoproto/gogo.proto";
 import "validate/validate.proto";
 
+option (gogoproto.stable_marshaler_all) = true;
+
 // [#protodoc-title: gRPC access logs]
 // Envoy access logs describe incoming interaction with Envoy over a fixed
 // period of time, and typically cover a single request/response exchange,
diff --git a/envoy/service/auth/v2/attribute_context.proto b/envoy/service/auth/v2/attribute_context.proto
index ed0dd33b..a012a17c 100644
--- a/envoy/service/auth/v2/attribute_context.proto
+++ b/envoy/service/auth/v2/attribute_context.proto
@@ -9,6 +9,9 @@ option java_package = "io.envoyproxy.envoy.service.auth.v2";
 import "envoy/api/v2/core/address.proto";
 
 import "google/protobuf/timestamp.proto";
+import "gogoproto/gogo.proto";
+
+option (gogoproto.stable_marshaler_all) = true;
 
 // [#protodoc-title: Attribute Context ]