diff --git a/api/envoy/admin/v2alpha/certs.proto b/api/envoy/admin/v2alpha/certs.proto
index 649e122c9d35d..ffcd069545399 100644
--- a/api/envoy/admin/v2alpha/certs.proto
+++ b/api/envoy/admin/v2alpha/certs.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
+option java_multiple_files = true;
 
 import "google/protobuf/timestamp.proto";
 
diff --git a/api/envoy/admin/v2alpha/clusters.proto b/api/envoy/admin/v2alpha/clusters.proto
index dd8c77eb8aa6e..b41d97335aaa7 100644
--- a/api/envoy/admin/v2alpha/clusters.proto
+++ b/api/envoy/admin/v2alpha/clusters.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
+option java_multiple_files = true;
 
 import "envoy/admin/v2alpha/metrics.proto";
 import "envoy/api/v2/core/address.proto";
diff --git a/api/envoy/admin/v2alpha/config_dump.proto b/api/envoy/admin/v2alpha/config_dump.proto
index 8f78148ff45ac..f02acaffe5d57 100644
--- a/api/envoy/admin/v2alpha/config_dump.proto
+++ b/api/envoy/admin/v2alpha/config_dump.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
+option java_multiple_files = true;
 
 import "envoy/api/v2/cds.proto";
 import "envoy/api/v2/lds.proto";
diff --git a/api/envoy/admin/v2alpha/memory.proto b/api/envoy/admin/v2alpha/memory.proto
index f148b2c69892a..556af7348764d 100644
--- a/api/envoy/admin/v2alpha/memory.proto
+++ b/api/envoy/admin/v2alpha/memory.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
+option java_multiple_files = true;
 
 // [#protodoc-title: Memory]
 
diff --git a/api/envoy/admin/v2alpha/metrics.proto b/api/envoy/admin/v2alpha/metrics.proto
index a22f3eed0547d..936ef2181249d 100644
--- a/api/envoy/admin/v2alpha/metrics.proto
+++ b/api/envoy/admin/v2alpha/metrics.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
+option java_multiple_files = true;
 
 // [#protodoc-title: Metrics]
 
diff --git a/api/envoy/admin/v2alpha/mutex_stats.proto b/api/envoy/admin/v2alpha/mutex_stats.proto
index 81194e5df2326..6b6b584513cfc 100644
--- a/api/envoy/admin/v2alpha/mutex_stats.proto
+++ b/api/envoy/admin/v2alpha/mutex_stats.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
+option java_multiple_files = true;
 
 // [#protodoc-title: MutexStats]
 
diff --git a/api/envoy/admin/v2alpha/server_info.proto b/api/envoy/admin/v2alpha/server_info.proto
index 171c6c6909307..51595efefc2f5 100644
--- a/api/envoy/admin/v2alpha/server_info.proto
+++ b/api/envoy/admin/v2alpha/server_info.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
+option java_multiple_files = true;
 
 import "google/protobuf/duration.proto";
 
diff --git a/api/envoy/api/v2/auth/cert.proto b/api/envoy/api/v2/auth/cert.proto
index bacd4778cca8a..15e10c680b8a4 100644
--- a/api/envoy/api/v2/auth/cert.proto
+++ b/api/envoy/api/v2/auth/cert.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.auth;
+option java_package = "io.envoyproxy.envoy.api.v2.auth";
+option java_multiple_files = true;
 option go_package = "auth";
 
 import "envoy/api/v2/core/base.proto";
diff --git a/api/envoy/api/v2/cds.proto b/api/envoy/api/v2/cds.proto
index a1021ec20c564..e8f86e9bfcc2c 100644
--- a/api/envoy/api/v2/cds.proto
+++ b/api/envoy/api/v2/cds.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+option java_package = "io.envoyproxy.envoy.api.v2";
+option java_multiple_files = true;
 
 option java_generic_services = true;
 
diff --git a/api/envoy/api/v2/cluster/circuit_breaker.proto b/api/envoy/api/v2/cluster/circuit_breaker.proto
index 1d574311d2009..0571f90eec9be 100644
--- a/api/envoy/api/v2/cluster/circuit_breaker.proto
+++ b/api/envoy/api/v2/cluster/circuit_breaker.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.cluster;
+option java_package = "io.envoyproxy.envoy.api.v2.cluster";
+option java_multiple_files = true;
 option go_package = "cluster";
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";
 
diff --git a/api/envoy/api/v2/cluster/outlier_detection.proto b/api/envoy/api/v2/cluster/outlier_detection.proto
index 3ef961928d5b1..c4fb9e8154640 100644
--- a/api/envoy/api/v2/cluster/outlier_detection.proto
+++ b/api/envoy/api/v2/cluster/outlier_detection.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.cluster;
+option java_package = "io.envoyproxy.envoy.api.v2.cluster";
+option java_multiple_files = true;
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";
 
 import "google/protobuf/duration.proto";
diff --git a/api/envoy/api/v2/core/address.proto b/api/envoy/api/v2/core/address.proto
index 081e313cdc497..009def943d94b 100644
--- a/api/envoy/api/v2/core/address.proto
+++ b/api/envoy/api/v2/core/address.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+option java_package = "io.envoyproxy.envoy.api.v2.core";
+option java_multiple_files = true;
 
 import "envoy/api/v2/core/base.proto";
 
diff --git a/api/envoy/api/v2/core/base.proto b/api/envoy/api/v2/core/base.proto
index b597fa1a4bbb1..82482099574fc 100644
--- a/api/envoy/api/v2/core/base.proto
+++ b/api/envoy/api/v2/core/base.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+option java_package = "io.envoyproxy.envoy.api.v2.core";
+option java_multiple_files = true;
 option go_package = "core";
 
 import "google/protobuf/any.proto";
diff --git a/api/envoy/api/v2/core/config_source.proto b/api/envoy/api/v2/core/config_source.proto
index 5d85e28505e88..56eb237965064 100644
--- a/api/envoy/api/v2/core/config_source.proto
+++ b/api/envoy/api/v2/core/config_source.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+option java_package = "io.envoyproxy.envoy.api.v2.core";
+option java_multiple_files = true;
 
 import "envoy/api/v2/core/grpc_service.proto";
 
diff --git a/api/envoy/api/v2/core/grpc_service.proto b/api/envoy/api/v2/core/grpc_service.proto
index f4e919c49c1a6..7a009d813ea5a 100644
--- a/api/envoy/api/v2/core/grpc_service.proto
+++ b/api/envoy/api/v2/core/grpc_service.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+option java_package = "io.envoyproxy.envoy.api.v2.core";
+option java_multiple_files = true;
 
 import "envoy/api/v2/core/base.proto";
 
diff --git a/api/envoy/api/v2/core/health_check.proto b/api/envoy/api/v2/core/health_check.proto
index 4a2e8673bfc23..ea2e245a77725 100644
--- a/api/envoy/api/v2/core/health_check.proto
+++ b/api/envoy/api/v2/core/health_check.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+option java_package = "io.envoyproxy.envoy.api.v2.core";
+option java_multiple_files = true;
 
 import "envoy/api/v2/core/base.proto";
 
diff --git a/api/envoy/api/v2/core/http_uri.proto b/api/envoy/api/v2/core/http_uri.proto
index 0c0ab766aa936..5b48bdd5ed075 100644
--- a/api/envoy/api/v2/core/http_uri.proto
+++ b/api/envoy/api/v2/core/http_uri.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+option java_package = "io.envoyproxy.envoy.api.v2.core";
+option java_multiple_files = true;
 
 import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";
diff --git a/api/envoy/api/v2/core/protocol.proto b/api/envoy/api/v2/core/protocol.proto
index 7399bedacddb4..e8ddf0e7f1db2 100644
--- a/api/envoy/api/v2/core/protocol.proto
+++ b/api/envoy/api/v2/core/protocol.proto
@@ -3,6 +3,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+option java_package = "io.envoyproxy.envoy.api.v2.core";
+option java_multiple_files = true;
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";
diff --git a/api/envoy/api/v2/discovery.proto b/api/envoy/api/v2/discovery.proto
index f3ab1913d9146..85fa34b90895a 100644
--- a/api/envoy/api/v2/discovery.proto
+++ b/api/envoy/api/v2/discovery.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+option java_package = "io.envoyproxy.envoy.api.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/base.proto";
diff --git a/api/envoy/api/v2/eds.proto b/api/envoy/api/v2/eds.proto
index b807ab98b52d5..d4cdd672217f3 100644
--- a/api/envoy/api/v2/eds.proto
+++ b/api/envoy/api/v2/eds.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+option java_package = "io.envoyproxy.envoy.api.v2";
+option java_multiple_files = true;
 
 option java_generic_services = true;
 
diff --git a/api/envoy/api/v2/endpoint/endpoint.proto b/api/envoy/api/v2/endpoint/endpoint.proto
index cba452ab33309..bdb677b80adc9 100644
--- a/api/envoy/api/v2/endpoint/endpoint.proto
+++ b/api/envoy/api/v2/endpoint/endpoint.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.endpoint;
+option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
+option java_multiple_files = true;
 option go_package = "endpoint";
 
 import "envoy/api/v2/core/address.proto";
diff --git a/api/envoy/api/v2/endpoint/load_report.proto b/api/envoy/api/v2/endpoint/load_report.proto
index 608bce8c0ca60..832e8504dbbfe 100644
--- a/api/envoy/api/v2/endpoint/load_report.proto
+++ b/api/envoy/api/v2/endpoint/load_report.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.endpoint;
+option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
+option java_multiple_files = true;
 
 import "envoy/api/v2/core/address.proto";
 import "envoy/api/v2/core/base.proto";
diff --git a/api/envoy/api/v2/lds.proto b/api/envoy/api/v2/lds.proto
index b9bb78729ed62..d05e37e5b080a 100644
--- a/api/envoy/api/v2/lds.proto
+++ b/api/envoy/api/v2/lds.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+option java_package = "io.envoyproxy.envoy.api.v2";
+option java_multiple_files = true;
 
 option java_generic_services = true;
 
diff --git a/api/envoy/api/v2/listener/listener.proto b/api/envoy/api/v2/listener/listener.proto
index 204790b97c427..0d617ceacf5ff 100644
--- a/api/envoy/api/v2/listener/listener.proto
+++ b/api/envoy/api/v2/listener/listener.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.listener;
+option java_package = "io.envoyproxy.envoy.api.v2.listener";
+option java_multiple_files = true;
 option go_package = "listener";
 option csharp_namespace = "Envoy.Api.V2.ListenerNS";
 
diff --git a/api/envoy/api/v2/ratelimit/ratelimit.proto b/api/envoy/api/v2/ratelimit/ratelimit.proto
index 47818cdc3ebe6..e60172d23a5dd 100644
--- a/api/envoy/api/v2/ratelimit/ratelimit.proto
+++ b/api/envoy/api/v2/ratelimit/ratelimit.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.ratelimit;
+option java_package = "io.envoyproxy.envoy.api.v2.ratelimit";
+option java_multiple_files = true;
 option go_package = "ratelimit";
 
 import "validate/validate.proto";
diff --git a/api/envoy/api/v2/rds.proto b/api/envoy/api/v2/rds.proto
index 4927f8dc643d8..3671f359ba2c9 100644
--- a/api/envoy/api/v2/rds.proto
+++ b/api/envoy/api/v2/rds.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+option java_package = "io.envoyproxy.envoy.api.v2";
+option java_multiple_files = true;
 
 option java_generic_services = true;
 
diff --git a/api/envoy/api/v2/route/route.proto b/api/envoy/api/v2/route/route.proto
index 30e78d2b3e7ce..7fbe350b5ce19 100644
--- a/api/envoy/api/v2/route/route.proto
+++ b/api/envoy/api/v2/route/route.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.api.v2.route;
+option java_package = "io.envoyproxy.envoy.api.v2.route";
+option java_multiple_files = true;
 option go_package = "route";
 option java_generic_services = true;
 
diff --git a/api/envoy/config/accesslog/v2/als.proto b/api/envoy/config/accesslog/v2/als.proto
index 5dd965a6cf94c..0c51d123cf4d4 100644
--- a/api/envoy/config/accesslog/v2/als.proto
+++ b/api/envoy/config/accesslog/v2/als.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.accesslog.v2;
+option java_package = "io.envoyproxy.envoy.config.accesslog.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/grpc_service.proto";
diff --git a/api/envoy/config/accesslog/v2/file.proto b/api/envoy/config/accesslog/v2/file.proto
index a53c5aab1e467..bd22ef2e92dfb 100644
--- a/api/envoy/config/accesslog/v2/file.proto
+++ b/api/envoy/config/accesslog/v2/file.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.accesslog.v2;
+option java_package = "io.envoyproxy.envoy.config.accesslog.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "validate/validate.proto";
diff --git a/api/envoy/config/bootstrap/v2/bootstrap.proto b/api/envoy/config/bootstrap/v2/bootstrap.proto
index 453e7dff34ad8..bc215a88ae55d 100644
--- a/api/envoy/config/bootstrap/v2/bootstrap.proto
+++ b/api/envoy/config/bootstrap/v2/bootstrap.proto
@@ -6,6 +6,8 @@
 syntax = "proto3";
 
 package envoy.config.bootstrap.v2;
+option java_package = "io.envoyproxy.envoy.config.bootstrap.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/address.proto";
diff --git a/api/envoy/config/filter/accesslog/v2/accesslog.proto b/api/envoy/config/filter/accesslog/v2/accesslog.proto
index 4a29c55eb0b73..e013ccc14c404 100644
--- a/api/envoy/config/filter/accesslog/v2/accesslog.proto
+++ b/api/envoy/config/filter/accesslog/v2/accesslog.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.accesslog.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/base.proto";
diff --git a/api/envoy/config/filter/fault/v2/fault.proto b/api/envoy/config/filter/fault/v2/fault.proto
index 56560f134ec91..15eefbed79a08 100644
--- a/api/envoy/config/filter/fault/v2/fault.proto
+++ b/api/envoy/config/filter/fault/v2/fault.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.fault.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.fault.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/type/percent.proto";
diff --git a/api/envoy/config/filter/http/buffer/v2/buffer.proto b/api/envoy/config/filter/http/buffer/v2/buffer.proto
index 0dfbfbdc2df6d..b476800b39266 100644
--- a/api/envoy/config/filter/http/buffer/v2/buffer.proto
+++ b/api/envoy/config/filter/http/buffer/v2/buffer.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.buffer.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.buffer.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "google/protobuf/duration.proto";
diff --git a/api/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto b/api/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto
index 5947f0b5f3ac7..6d8566ad48a42 100644
--- a/api/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto
+++ b/api/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.ext_authz.v2alpha;
+option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v2alpha";
+option java_multiple_files = true;
 option go_package = "v2alpha";
 
 import "envoy/api/v2/core/base.proto";
diff --git a/api/envoy/config/filter/http/fault/v2/fault.proto b/api/envoy/config/filter/http/fault/v2/fault.proto
index d42a9fe9bb831..e1e24e6f9dd6a 100644
--- a/api/envoy/config/filter/http/fault/v2/fault.proto
+++ b/api/envoy/config/filter/http/fault/v2/fault.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.fault.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/route/route.proto";
diff --git a/api/envoy/config/filter/http/gzip/v2/gzip.proto b/api/envoy/config/filter/http/gzip/v2/gzip.proto
index d98972e936aac..63216c54db588 100644
--- a/api/envoy/config/filter/http/gzip/v2/gzip.proto
+++ b/api/envoy/config/filter/http/gzip/v2/gzip.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.gzip.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.gzip.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "google/protobuf/wrappers.proto";
diff --git a/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto b/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto
index 813dacfd932ee..2adaa8dc7ec9a 100644
--- a/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto
+++ b/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.header_to_metadata.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.header_to_metadata.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "validate/validate.proto";
diff --git a/api/envoy/config/filter/http/health_check/v2/health_check.proto b/api/envoy/config/filter/http/health_check/v2/health_check.proto
index 0f584b451f68a..c3c8290d90bca 100644
--- a/api/envoy/config/filter/http/health_check/v2/health_check.proto
+++ b/api/envoy/config/filter/http/health_check/v2/health_check.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.health_check.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "google/protobuf/duration.proto";
diff --git a/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto b/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto
index 902e90a2b16f5..a8d86d71dd463 100644
--- a/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto
+++ b/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.ip_tagging.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/address.proto";
diff --git a/api/envoy/config/filter/http/jwt_authn/v2alpha/config.proto b/api/envoy/config/filter/http/jwt_authn/v2alpha/config.proto
index 71feff2290d72..1a52ae1ccf982 100644
--- a/api/envoy/config/filter/http/jwt_authn/v2alpha/config.proto
+++ b/api/envoy/config/filter/http/jwt_authn/v2alpha/config.proto
@@ -2,6 +2,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.jwt_authn.v2alpha;
+option java_package = "io.envoyproxy.envoy.config.filter.http.jwt_authn.v2alpha";
+option java_multiple_files = true;
 
 import "envoy/api/v2/core/base.proto";
 import "envoy/api/v2/core/http_uri.proto";
diff --git a/api/envoy/config/filter/http/lua/v2/lua.proto b/api/envoy/config/filter/http/lua/v2/lua.proto
index f42f1b6ef7044..3c0887b3dcd83 100644
--- a/api/envoy/config/filter/http/lua/v2/lua.proto
+++ b/api/envoy/config/filter/http/lua/v2/lua.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.lua.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.lua.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "validate/validate.proto";
diff --git a/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto b/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto
index 773d11537b398..a1cfabbfa63ef 100644
--- a/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto
+++ b/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.rate_limit.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/config/ratelimit/v2/rls.proto";
diff --git a/api/envoy/config/filter/http/rbac/v2/rbac.proto b/api/envoy/config/filter/http/rbac/v2/rbac.proto
index 2947c8b69a096..847372edf1a4a 100644
--- a/api/envoy/config/filter/http/rbac/v2/rbac.proto
+++ b/api/envoy/config/filter/http/rbac/v2/rbac.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.rbac.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/config/rbac/v2alpha/rbac.proto";
diff --git a/api/envoy/config/filter/http/router/v2/router.proto b/api/envoy/config/filter/http/router/v2/router.proto
index 5ecf88c5da726..b8a394c4a0d08 100644
--- a/api/envoy/config/filter/http/router/v2/router.proto
+++ b/api/envoy/config/filter/http/router/v2/router.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.router.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.router.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/config/filter/accesslog/v2/accesslog.proto";
diff --git a/api/envoy/config/filter/http/squash/v2/squash.proto b/api/envoy/config/filter/http/squash/v2/squash.proto
index a1455417b75a1..472cc9331fcc2 100644
--- a/api/envoy/config/filter/http/squash/v2/squash.proto
+++ b/api/envoy/config/filter/http/squash/v2/squash.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.squash.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.squash.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "google/protobuf/duration.proto";
diff --git a/api/envoy/config/filter/http/transcoder/v2/transcoder.proto b/api/envoy/config/filter/http/transcoder/v2/transcoder.proto
index cb937b3b91ab1..342a8b5c129d7 100644
--- a/api/envoy/config/filter/http/transcoder/v2/transcoder.proto
+++ b/api/envoy/config/filter/http/transcoder/v2/transcoder.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.transcoder.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.http.transcoder.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "validate/validate.proto";
diff --git a/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto b/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto
index 7d0321cf8fafb..7a3a5487d1778 100644
--- a/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto
+++ b/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.client_ssl_auth.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.network.client_ssl_auth.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/address.proto";
diff --git a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto
index 879108a14054e..ea98392af9c0d 100644
--- a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto
+++ b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.extensions.filters.network.dubbo_proxy.v2alpha1;
+option java_package = "io.envoyproxy.envoy.extensions.filters.network.dubbo_proxy.v2alpha1";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "validate/validate.proto";
diff --git a/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto b/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto
index 020fb8e519a4d..8bfd00df22d50 100644
--- a/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto
+++ b/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.ext_authz.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.network.ext_authz.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/grpc_service.proto";
diff --git a/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto b/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto
index c6cb8bfc0d120..440188ef9f33e 100644
--- a/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto
+++ b/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.http_connection_manager.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.network.http_connection_manager.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/config_source.proto";
diff --git a/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto b/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto
index 476f401accc04..c7756e47fc28a 100644
--- a/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto
+++ b/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.mongo_proxy.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.network.mongo_proxy.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/config/filter/fault/v2/fault.proto";
diff --git a/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto b/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto
index c0a2d8f5db5ad..cb390c1641728 100644
--- a/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto
+++ b/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.rate_limit.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.network.rate_limit.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/ratelimit/ratelimit.proto";
diff --git a/api/envoy/config/filter/network/rbac/v2/rbac.proto b/api/envoy/config/filter/network/rbac/v2/rbac.proto
index 6f4427816b28d..171c17bcf5ab2 100644
--- a/api/envoy/config/filter/network/rbac/v2/rbac.proto
+++ b/api/envoy/config/filter/network/rbac/v2/rbac.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.rbac.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/config/rbac/v2alpha/rbac.proto";
diff --git a/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto b/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto
index 4d5220136458b..367999b336637 100644
--- a/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto
+++ b/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.redis_proxy.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.network.redis_proxy.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "google/protobuf/duration.proto";
diff --git a/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto b/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto
index c0cced1f1a58e..0cb8c179d0dbb 100644
--- a/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto
+++ b/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.tcp_proxy.v2;
+option java_package = "io.envoyproxy.envoy.config.filter.network.tcp_proxy.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/config/filter/accesslog/v2/accesslog.proto";
diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto
index 5381bb261b882..2936f19996ae8 100644
--- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto
+++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.thrift_proxy.v2alpha1;
+option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/base.proto";
diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto
index 1ce0d3b407f66..7d17a6aab9ce1 100644
--- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto
+++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.thrift_proxy.v2alpha1;
+option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto";
diff --git a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto
index 9c23d487861ba..dedad645357c8 100644
--- a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto
+++ b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.thrift.rate_limit.v2alpha1;
+option java_package = "io.envoyproxy.envoy.config.filter.thrift.rate_limit.v2alpha1";
+option java_multiple_files = true;
 option go_package = "v2alpha1";
 
 import "envoy/config/ratelimit/v2/rls.proto";
diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto
index 6731e2739a548..5c0b602381c0f 100644
--- a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto
+++ b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.thrift.router.v2alpha1;
+option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1";
+option java_multiple_files = true;
 option go_package = "v2alpha1";
 
 // [#protodoc-title: Router]
diff --git a/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto b/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto
index f2e00b8ef7334..9f1848a20b187 100644
--- a/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto
+++ b/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto
@@ -4,6 +4,8 @@ syntax = "proto3";
 // Configuration for File Based Metadata Grpc Credentials Plugin
 
 package envoy.config.grpc_credential.v2alpha;
+option java_package = "io.envoyproxy.envoy.config.grpc_credential.v2alpha";
+option java_multiple_files = true;
 option go_package = "v2alpha";
 
 import "envoy/api/v2/core/base.proto";
diff --git a/api/envoy/config/health_checker/redis/v2/redis.proto b/api/envoy/config/health_checker/redis/v2/redis.proto
index 3204d05e89327..9438ff66887fa 100644
--- a/api/envoy/config/health_checker/redis/v2/redis.proto
+++ b/api/envoy/config/health_checker/redis/v2/redis.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.health_checker.redis.v2;
+option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 // [#protodoc-title: Redis]
diff --git a/api/envoy/config/metrics/v2/metrics_service.proto b/api/envoy/config/metrics/v2/metrics_service.proto
index 39e0f97241bb2..fb3e88d34a719 100644
--- a/api/envoy/config/metrics/v2/metrics_service.proto
+++ b/api/envoy/config/metrics/v2/metrics_service.proto
@@ -3,6 +3,8 @@ syntax = "proto3";
 // [#protodoc-title: Metrics service]
 
 package envoy.config.metrics.v2;
+option java_package = "io.envoyproxy.envoy.config.metrics.v2";
+option java_multiple_files = true;
 
 import "envoy/api/v2/core/grpc_service.proto";
 
diff --git a/api/envoy/config/metrics/v2/stats.proto b/api/envoy/config/metrics/v2/stats.proto
index 542920d889bbd..1cd4b146f8d24 100644
--- a/api/envoy/config/metrics/v2/stats.proto
+++ b/api/envoy/config/metrics/v2/stats.proto
@@ -4,6 +4,8 @@
 syntax = "proto3";
 
 package envoy.config.metrics.v2;
+option java_package = "io.envoyproxy.envoy.config.metrics.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/address.proto";
diff --git a/api/envoy/config/overload/v2alpha/overload.proto b/api/envoy/config/overload/v2alpha/overload.proto
index 6b37fe432fdde..cbb34e17b7f40 100644
--- a/api/envoy/config/overload/v2alpha/overload.proto
+++ b/api/envoy/config/overload/v2alpha/overload.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.overload.v2alpha;
+option java_package = "io.envoyproxy.envoy.config.overload.v2alpha";
+option java_multiple_files = true;
 option go_package = "v2alpha";
 
 import "google/protobuf/any.proto";
diff --git a/api/envoy/config/ratelimit/v2/rls.proto b/api/envoy/config/ratelimit/v2/rls.proto
index 0c76ad83b468f..7deeac9065a33 100644
--- a/api/envoy/config/ratelimit/v2/rls.proto
+++ b/api/envoy/config/ratelimit/v2/rls.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.ratelimit.v2;
+option java_package = "io.envoyproxy.envoy.config.ratelimit.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/grpc_service.proto";
diff --git a/api/envoy/config/rbac/v2alpha/rbac.proto b/api/envoy/config/rbac/v2alpha/rbac.proto
index 0751b67177bb7..35aea0f04c7b7 100644
--- a/api/envoy/config/rbac/v2alpha/rbac.proto
+++ b/api/envoy/config/rbac/v2alpha/rbac.proto
@@ -7,6 +7,8 @@ import "envoy/type/matcher/metadata.proto";
 import "envoy/type/matcher/string.proto";
 
 package envoy.config.rbac.v2alpha;
+option java_package = "io.envoyproxy.envoy.config.rbac.v2alpha";
+option java_multiple_files = true;
 option go_package = "v2alpha";
 
 // [#protodoc-title: Role Based Access Control (RBAC)]
diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto
index 6e0127a5c7254..3483224405877 100644
--- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto
+++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.resource_monitor.fixed_heap.v2alpha;
+option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha";
+option java_multiple_files = true;
 option go_package = "v2alpha";
 
 // [#protodoc-title: Fixed heap]
diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto
index 58bd782a40b9b..beb8f467454c0 100644
--- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto
+++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.resource_monitor.injected_resource.v2alpha;
+option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha";
+option java_multiple_files = true;
 option go_package = "v2alpha";
 
 import "validate/validate.proto";
diff --git a/api/envoy/config/retry/previous_priorities/previous_priorities_config.proto b/api/envoy/config/retry/previous_priorities/previous_priorities_config.proto
index fb55cdbb1e708..ae3c3ea0b9971 100644
--- a/api/envoy/config/retry/previous_priorities/previous_priorities_config.proto
+++ b/api/envoy/config/retry/previous_priorities/previous_priorities_config.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.retry.previous_priorities;
+option java_package = "io.envoyproxy.envoy.config.retry.previous_priorities";
+option java_multiple_files = true;
 
 // A retry host selector that attempts to spread retries between priorities, even if certain
 // priorities would not normally be attempted due to higher priorities being available.
diff --git a/api/envoy/config/trace/v2/trace.proto b/api/envoy/config/trace/v2/trace.proto
index 7aac3277fee9b..058bc99bfcff5 100644
--- a/api/envoy/config/trace/v2/trace.proto
+++ b/api/envoy/config/trace/v2/trace.proto
@@ -4,6 +4,8 @@
 syntax = "proto3";
 
 package envoy.config.trace.v2;
+option java_package = "io.envoyproxy.envoy.config.trace.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/grpc_service.proto";
diff --git a/api/envoy/config/transport_socket/alts/v2alpha/alts.proto b/api/envoy/config/transport_socket/alts/v2alpha/alts.proto
index a4d414c0d6189..5286d94ad06aa 100644
--- a/api/envoy/config/transport_socket/alts/v2alpha/alts.proto
+++ b/api/envoy/config/transport_socket/alts/v2alpha/alts.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.transport_socket.alts.v2alpha;
+option java_package = "io.envoyproxy.envoy.config.transport_socket.alts.v2alpha";
+option java_multiple_files = true;
 option go_package = "v2";
 
 // [#protodoc-title: ALTS]
diff --git a/api/envoy/config/transport_socket/capture/v2alpha/capture.proto b/api/envoy/config/transport_socket/capture/v2alpha/capture.proto
index 6d2f9a0e43ffe..dda6602a89f3f 100644
--- a/api/envoy/config/transport_socket/capture/v2alpha/capture.proto
+++ b/api/envoy/config/transport_socket/capture/v2alpha/capture.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.transport_socket.capture.v2alpha;
+option java_package = "io.envoyproxy.envoy.config.transport_socket.capture.v2alpha";
+option java_multiple_files = true;
 option go_package = "v2";
 
 // [#protodoc-title: Capture]
diff --git a/api/envoy/data/accesslog/v2/accesslog.proto b/api/envoy/data/accesslog/v2/accesslog.proto
index 610e2a4883c90..6ca159d450e8c 100644
--- a/api/envoy/data/accesslog/v2/accesslog.proto
+++ b/api/envoy/data/accesslog/v2/accesslog.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.data.accesslog.v2;
+option java_package = "io.envoyproxy.envoy.data.accesslog.v2";
+option java_multiple_files = true;
 
 import "envoy/api/v2/core/address.proto";
 import "envoy/api/v2/core/base.proto";
diff --git a/api/envoy/data/core/v2alpha/health_check_event.proto b/api/envoy/data/core/v2alpha/health_check_event.proto
index dfb016e8ecff7..51efb1197c0f8 100644
--- a/api/envoy/data/core/v2alpha/health_check_event.proto
+++ b/api/envoy/data/core/v2alpha/health_check_event.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.data.core.v2alpha;
+option java_package = "io.envoyproxy.envoy.data.core.v2alpha";
+option java_multiple_files = true;
 
 import "envoy/api/v2/core/address.proto";
 
diff --git a/api/envoy/data/tap/v2alpha/capture.proto b/api/envoy/data/tap/v2alpha/capture.proto
index 57c68277140a6..aea51a19a594b 100644
--- a/api/envoy/data/tap/v2alpha/capture.proto
+++ b/api/envoy/data/tap/v2alpha/capture.proto
@@ -5,6 +5,8 @@ syntax = "proto3";
 // sequences on a socket.
 
 package envoy.data.tap.v2alpha;
+option java_package = "io.envoyproxy.envoy.data.tap.v2alpha";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/address.proto";
diff --git a/api/envoy/service/accesslog/v2/als.proto b/api/envoy/service/accesslog/v2/als.proto
index 168293e08728b..aca6c938276f7 100644
--- a/api/envoy/service/accesslog/v2/als.proto
+++ b/api/envoy/service/accesslog/v2/als.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.service.accesslog.v2;
+option java_package = "io.envoyproxy.envoy.service.accesslog.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 option java_generic_services = true;
 
diff --git a/api/envoy/service/auth/v2alpha/attribute_context.proto b/api/envoy/service/auth/v2alpha/attribute_context.proto
index 3ef8fe3903a87..8f2e2243acf3c 100644
--- a/api/envoy/service/auth/v2alpha/attribute_context.proto
+++ b/api/envoy/service/auth/v2alpha/attribute_context.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.service.auth.v2alpha;
+option java_package = "io.envoyproxy.envoy.service.auth.v2alpha";
+option java_multiple_files = true;
 
 import "envoy/api/v2/core/address.proto";
 
diff --git a/api/envoy/service/auth/v2alpha/external_auth.proto b/api/envoy/service/auth/v2alpha/external_auth.proto
index caa5e3089573b..deca67ef0e43c 100644
--- a/api/envoy/service/auth/v2alpha/external_auth.proto
+++ b/api/envoy/service/auth/v2alpha/external_auth.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.service.auth.v2alpha;
+option java_package = "io.envoyproxy.envoy.service.auth.v2alpha";
+option java_multiple_files = true;
 option go_package = "v2alpha";
 option java_generic_services = true;
 
diff --git a/api/envoy/service/discovery/v2/ads.proto b/api/envoy/service/discovery/v2/ads.proto
index 16953ee7b9a6c..108fb1da68c81 100644
--- a/api/envoy/service/discovery/v2/ads.proto
+++ b/api/envoy/service/discovery/v2/ads.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.service.discovery.v2;
+option java_package = "io.envoyproxy.envoy.service.discovery.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 option java_generic_services = true;
 
diff --git a/api/envoy/service/discovery/v2/hds.proto b/api/envoy/service/discovery/v2/hds.proto
index a02cfa5cbb5cc..d19e3cb699d2f 100644
--- a/api/envoy/service/discovery/v2/hds.proto
+++ b/api/envoy/service/discovery/v2/hds.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.service.discovery.v2;
+option java_package = "io.envoyproxy.envoy.service.discovery.v2";
+option java_multiple_files = true;
 
 option java_generic_services = true;
 
diff --git a/api/envoy/service/discovery/v2/sds.proto b/api/envoy/service/discovery/v2/sds.proto
index 4bea525fa4537..51b699d6526c0 100644
--- a/api/envoy/service/discovery/v2/sds.proto
+++ b/api/envoy/service/discovery/v2/sds.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.service.discovery.v2;
+option java_package = "io.envoyproxy.envoy.service.discovery.v2";
+option java_multiple_files = true;
 
 import "envoy/api/v2/discovery.proto";
 
diff --git a/api/envoy/service/load_stats/v2/lrs.proto b/api/envoy/service/load_stats/v2/lrs.proto
index 6dee77db87cf9..849f69a7749ee 100644
--- a/api/envoy/service/load_stats/v2/lrs.proto
+++ b/api/envoy/service/load_stats/v2/lrs.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.service.load_stats.v2;
+option java_package = "io.envoyproxy.envoy.service.load_stats.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 option java_generic_services = true;
 
diff --git a/api/envoy/service/metrics/v2/metrics_service.proto b/api/envoy/service/metrics/v2/metrics_service.proto
index 15419b4d8f237..8f9e08c620d20 100644
--- a/api/envoy/service/metrics/v2/metrics_service.proto
+++ b/api/envoy/service/metrics/v2/metrics_service.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.service.metrics.v2;
+option java_package = "io.envoyproxy.envoy.service.metrics.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 option java_generic_services = true;
 
diff --git a/api/envoy/service/ratelimit/v2/rls.proto b/api/envoy/service/ratelimit/v2/rls.proto
index 6ebea2b4cdd02..4d4f768a5bd11 100644
--- a/api/envoy/service/ratelimit/v2/rls.proto
+++ b/api/envoy/service/ratelimit/v2/rls.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.service.ratelimit.v2;
+option java_package = "io.envoyproxy.envoy.service.ratelimit.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 
 import "envoy/api/v2/core/base.proto";
diff --git a/api/envoy/service/trace/v2/trace_service.proto b/api/envoy/service/trace/v2/trace_service.proto
index bcc314eb47b25..89ff50e1d853e 100644
--- a/api/envoy/service/trace/v2/trace_service.proto
+++ b/api/envoy/service/trace/v2/trace_service.proto
@@ -3,6 +3,8 @@ syntax = "proto3";
 // [#proto-status: draft]
 
 package envoy.service.trace.v2;
+option java_package = "io.envoyproxy.envoy.service.trace.v2";
+option java_multiple_files = true;
 option go_package = "v2";
 option java_generic_services = true;
 
diff --git a/api/envoy/type/http_status.proto b/api/envoy/type/http_status.proto
index 35655613c198c..b682ea05a3a89 100644
--- a/api/envoy/type/http_status.proto
+++ b/api/envoy/type/http_status.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.type;
+option java_package = "io.envoyproxy.envoy.type";
+option java_multiple_files = true;
 
 import "validate/validate.proto";
 
diff --git a/api/envoy/type/matcher/metadata.proto b/api/envoy/type/matcher/metadata.proto
index 9faa53b1397e5..d59f08ceeabc9 100644
--- a/api/envoy/type/matcher/metadata.proto
+++ b/api/envoy/type/matcher/metadata.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.type.matcher;
+option java_package = "io.envoyproxy.envoy.type.matcher";
+option java_multiple_files = true;
 option go_package = "matcher";
 
 import "envoy/type/matcher/value.proto";
diff --git a/api/envoy/type/matcher/number.proto b/api/envoy/type/matcher/number.proto
index 9cf4ff1f10458..78d4beb36f558 100644
--- a/api/envoy/type/matcher/number.proto
+++ b/api/envoy/type/matcher/number.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.type.matcher;
+option java_package = "io.envoyproxy.envoy.type.matcher";
+option java_multiple_files = true;
 option go_package = "matcher";
 
 import "envoy/type/range.proto";
diff --git a/api/envoy/type/matcher/string.proto b/api/envoy/type/matcher/string.proto
index db6930f9041f8..e22e6c7d277b5 100644
--- a/api/envoy/type/matcher/string.proto
+++ b/api/envoy/type/matcher/string.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.type.matcher;
+option java_package = "io.envoyproxy.envoy.type.matcher";
+option java_multiple_files = true;
 option go_package = "matcher";
 
 import "validate/validate.proto";
diff --git a/api/envoy/type/matcher/value.proto b/api/envoy/type/matcher/value.proto
index d5a664a86c4bd..dcd8db0174341 100644
--- a/api/envoy/type/matcher/value.proto
+++ b/api/envoy/type/matcher/value.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.type.matcher;
+option java_package = "io.envoyproxy.envoy.type.matcher";
+option java_multiple_files = true;
 option go_package = "matcher";
 
 import "envoy/type/matcher/number.proto";
diff --git a/api/envoy/type/percent.proto b/api/envoy/type/percent.proto
index 3641d823e604c..fc12de753db45 100644
--- a/api/envoy/type/percent.proto
+++ b/api/envoy/type/percent.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.type;
+option java_package = "io.envoyproxy.envoy.type";
+option java_multiple_files = true;
 
 import "validate/validate.proto";
 import "gogoproto/gogo.proto";
diff --git a/api/envoy/type/range.proto b/api/envoy/type/range.proto
index 115091ddf9f69..bb0fd19df5722 100644
--- a/api/envoy/type/range.proto
+++ b/api/envoy/type/range.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.type;
+option java_package = "io.envoyproxy.envoy.type";
+option java_multiple_files = true;
 option go_package = "envoy_type";
 
 import "gogoproto/gogo.proto";
diff --git a/tools/check_format.py b/tools/check_format.py
index cef05983895b2..3800fdcd63076 100755
--- a/tools/check_format.py
+++ b/tools/check_format.py
@@ -144,6 +144,27 @@ def checkNamespace(file_path):
   return []
 
 
+def checkJavaProtoOptions(file_path):
+  java_multiple_files = False
+  java_package_correct = False
+  for line in fileinput.FileInput(file_path):
+    if "option java_multiple_files = true;" in line:
+      java_multiple_files = True
+    if "option java_package = \"io.envoyproxy.envoy" in line:
+      java_package_correct = True
+    if java_multiple_files and java_package_correct:
+      return []
+
+  error_messages = []
+  if not java_multiple_files:
+    error_messages.append(
+        "Java proto option 'java_multiple_files' not set correctly for file: %s" % file_path)
+  if not java_package_correct:
+    error_messages.append(
+        "Java proto option 'java_package' not set correctly for file: %s" % file_path)
+  return error_messages
+
+
 # To avoid breaking the Lyft import, we just check for path inclusion here.
 def whitelistedForProtobufDeps(file_path):
   return (file_path.endswith(PROTO_SUFFIX) or file_path.endswith(REPOSITORIES_BZL) or \
@@ -372,6 +393,8 @@ def checkSourcePath(file_path):
     command = ("%s %s | diff %s -" % (CLANG_FORMAT_PATH, file_path, file_path))
     error_messages += executeCommand(command, "clang-format check failed", file_path)
 
+  if file_path.endswith(PROTO_SUFFIX) and isApiFile(file_path):
+    error_messages += checkJavaProtoOptions(file_path)
   return error_messages