diff --git a/common/common.proto b/common/common.proto
index 398656c27..16219565d 100644
--- a/common/common.proto
+++ b/common/common.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package common;
+
 option go_package = "go.temporal.io/temporal-proto/common";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 import "enums/enums.proto";
 
diff --git a/common/decision.proto b/common/decision.proto
index 61cfe66a3..ab7ed7528 100644
--- a/common/decision.proto
+++ b/common/decision.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package common;
+
 option go_package = "go.temporal.io/temporal-proto/common";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 import "enums/enums.proto";
 import "common/common.proto";
diff --git a/common/domain.proto b/common/domain.proto
index d02d781bc..87d7b928f 100644
--- a/common/domain.proto
+++ b/common/domain.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package common;
+
 option go_package = "go.temporal.io/temporal-proto/common";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 import "enums/enums.proto";
 import "common/wrappers.proto";
diff --git a/common/history.proto b/common/history.proto
index 9e221b3a0..6c6463968 100644
--- a/common/history.proto
+++ b/common/history.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package common;
+
 option go_package = "go.temporal.io/temporal-proto/common";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 import "enums/enums.proto";
 import "common/common.proto";
diff --git a/common/replication.proto b/common/replication.proto
index 7ab65ba5d..383fb1e08 100644
--- a/common/replication.proto
+++ b/common/replication.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package common;
+
 option go_package = "go.temporal.io/temporal-proto/common";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 import "enums/enums.proto";
 import "common/common.proto";
diff --git a/common/workflow_execution.proto b/common/workflow_execution.proto
index 10c96b219..1ce0f6256 100644
--- a/common/workflow_execution.proto
+++ b/common/workflow_execution.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package common;
+
 option go_package = "go.temporal.io/temporal-proto/common";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 import "enums/enums.proto";
 import "common/common.proto";
diff --git a/common/wrappers.proto b/common/wrappers.proto
index 80ad47795..012588bd0 100644
--- a/common/wrappers.proto
+++ b/common/wrappers.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package common;
+
 option go_package = "go.temporal.io/temporal-proto/common";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 // YARPC plugin generates wrong code for standard wrappers "google/protobuf/wrappers.proto".
 // TODO: remove this file and replace it usage with "google/protobuf/wrappers.proto" after migrate out of YARPC.
diff --git a/enums/enums.proto b/enums/enums.proto
index 8178ba851..67c20d96b 100644
--- a/enums/enums.proto
+++ b/enums/enums.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package enums;
+
 option go_package = "go.temporal.io/temporal-proto/enums";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 enum WorkflowIdReusePolicy {
      // Allow start a workflow execution using the same workflow ID, when workflow not running, and the last execution close state is in
diff --git a/errordetails/error_details.proto b/errordetails/error_details.proto
index d6b7f4a25..c3c50895e 100644
--- a/errordetails/error_details.proto
+++ b/errordetails/error_details.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package errordetails;
+
 option go_package = "go.temporal.io/temporal-proto/errordetails";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 // These messages extend https://github.com/googleapis/googleapis/blob/master/google/rpc/error_details.proto
 
diff --git a/workflowservice/request_response.proto b/workflowservice/request_response.proto
index 13a29e5e6..b9eba71d9 100644
--- a/workflowservice/request_response.proto
+++ b/workflowservice/request_response.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package workflowservice;
+
 option go_package = "go.temporal.io/temporal-proto/workflowservice";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 import "enums/enums.proto";
 import "common/common.proto";
diff --git a/workflowservice/service.proto b/workflowservice/service.proto
index 7be356206..deccb9132 100644
--- a/workflowservice/service.proto
+++ b/workflowservice/service.proto
@@ -21,8 +21,10 @@
 syntax = "proto3";
 
 package workflowservice;
+
 option go_package = "go.temporal.io/temporal-proto/workflowservice";
 option java_package = "io.temporal";
+option java_multiple_files = true;
 
 import "workflowservice/request_response.proto";