diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index fae0ab53c70b..fbfa837d9fd6 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -52,8 +52,9 @@ evaluationDependsOn(":sdks:java:container:java11")
 
 ext.dataflowLegacyEnvironmentMajorVersion = '8'
 ext.dataflowFnapiEnvironmentMajorVersion = '8'
-ext.dataflowLegacyContainerVersion = 'beam-master-20260911'
-ext.dataflowFnapiContainerVersion = 'beam-master-20260909'
+// These should always be in sync to avoid issues like https://github.com/apache/beam/issues/30634
+ext.dataflowLegacyContainerVersion = 'beam-master-20260916'
+ext.dataflowFnapiContainerVersion = 'beam-master-20260916'
 ext.dataflowContainerBaseRepository = 'gcr.io/cloud-dataflow/v1beta3'
 
 processResources {