diff --git a/envoy/api/v2/cds.proto b/envoy/api/v2/cds.proto
index 94c33795..9be20a86 100644
--- a/envoy/api/v2/cds.proto
+++ b/envoy/api/v2/cds.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package envoy.api.v2;
 
+option java_generic_services = true;
+
 import "envoy/api/v2/core/address.proto";
 import "envoy/api/v2/auth/cert.proto";
 import "envoy/api/v2/core/base.proto";
diff --git a/envoy/api/v2/eds.proto b/envoy/api/v2/eds.proto
index 2280982d..0c63fbaa 100644
--- a/envoy/api/v2/eds.proto
+++ b/envoy/api/v2/eds.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package envoy.api.v2;
 
+option java_generic_services = true;
+
 import "envoy/api/v2/discovery.proto";
 import "envoy/api/v2/endpoint/endpoint.proto";
 
diff --git a/envoy/api/v2/lds.proto b/envoy/api/v2/lds.proto
index ffa30479..b3d01745 100644
--- a/envoy/api/v2/lds.proto
+++ b/envoy/api/v2/lds.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package envoy.api.v2;
 
+option java_generic_services = true;
+
 import "envoy/api/v2/core/address.proto";
 import "envoy/api/v2/core/base.proto";
 import "envoy/api/v2/discovery.proto";
diff --git a/envoy/api/v2/rds.proto b/envoy/api/v2/rds.proto
index e153419d..e820852d 100644
--- a/envoy/api/v2/rds.proto
+++ b/envoy/api/v2/rds.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package envoy.api.v2;
 
+option java_generic_services = true;
+
 import "envoy/api/v2/core/base.proto";
 import "envoy/api/v2/discovery.proto";
 import "envoy/api/v2/route/route.proto";
diff --git a/envoy/api/v2/route/route.proto b/envoy/api/v2/route/route.proto
index 2533ff24..2b887cb0 100644
--- a/envoy/api/v2/route/route.proto
+++ b/envoy/api/v2/route/route.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package envoy.api.v2.route;
 option go_package = "route";
+option java_generic_services = true;
 
 import "envoy/api/v2/core/base.proto";
 import "envoy/api/v2/auth/auth.proto";
diff --git a/envoy/service/accesslog/v2/als.proto b/envoy/service/accesslog/v2/als.proto
index 9f3ad343..ec60b6d1 100644
--- a/envoy/service/accesslog/v2/als.proto
+++ b/envoy/service/accesslog/v2/als.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package envoy.service.accesslog.v2;
 option go_package = "v2";
+option java_generic_services = true;
 
 import "envoy/api/v2/core/base.proto";
 import "envoy/config/filter/accesslog/v2/accesslog.proto";
diff --git a/envoy/service/auth/v2/external_auth.proto b/envoy/service/auth/v2/external_auth.proto
index 149af57c..c5f571a6 100644
--- a/envoy/service/auth/v2/external_auth.proto
+++ b/envoy/service/auth/v2/external_auth.proto
@@ -4,6 +4,7 @@ syntax = "proto3";
 
 package envoy.service.auth.v2;
 option go_package = "v2";
+option java_generic_services = true;
 
 import "envoy/service/auth/v2/attribute_context.proto";
 
diff --git a/envoy/service/discovery/v2/ads.proto b/envoy/service/discovery/v2/ads.proto
index d75bc52e..821ccb34 100644
--- a/envoy/service/discovery/v2/ads.proto
+++ b/envoy/service/discovery/v2/ads.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package envoy.service.discovery.v2;
 option go_package = "v2";
+option java_generic_services = true;
 
 import "envoy/api/v2/discovery.proto";
 
diff --git a/envoy/service/discovery/v2/hds.proto b/envoy/service/discovery/v2/hds.proto
index 00aef2d7..cdf60119 100644
--- a/envoy/service/discovery/v2/hds.proto
+++ b/envoy/service/discovery/v2/hds.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package envoy.service.discovery.v2;
 
+option java_generic_services = true;
+
 import "envoy/api/v2/core/base.proto";
 import "envoy/api/v2/core/health_check.proto";
 import "envoy/api/v2/endpoint/endpoint.proto";
diff --git a/envoy/service/load_stats/v2/lrs.proto b/envoy/service/load_stats/v2/lrs.proto
index 57d5ee7e..2181fa0f 100644
--- a/envoy/service/load_stats/v2/lrs.proto
+++ b/envoy/service/load_stats/v2/lrs.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package envoy.service.load_stats.v2;
 option go_package = "v2";
+option java_generic_services = true;
 
 import "envoy/api/v2/core/base.proto";
 import "envoy/api/v2/endpoint/load_report.proto";
diff --git a/envoy/service/metrics/v2/metrics_service.proto b/envoy/service/metrics/v2/metrics_service.proto
index 51a1f8a6..34c219a2 100644
--- a/envoy/service/metrics/v2/metrics_service.proto
+++ b/envoy/service/metrics/v2/metrics_service.proto
@@ -4,6 +4,7 @@ syntax = "proto3";
 
 package envoy.service.metrics.v2;
 option go_package = "v2";
+option java_generic_services = true;
 
 import "envoy/api/v2/core/base.proto";
 
diff --git a/envoy/service/trace/v2/trace_service.proto b/envoy/service/trace/v2/trace_service.proto
index 03a7eba7..795f61f9 100644
--- a/envoy/service/trace/v2/trace_service.proto
+++ b/envoy/service/trace/v2/trace_service.proto
@@ -4,6 +4,7 @@ syntax = "proto3";
 
 package envoy.service.trace.v2;
 option go_package = "v2";
+option java_generic_services = true;
 
 import "envoy/api/v2/core/base.proto";
 import "trace.proto";