diff --git a/pom.xml b/pom.xml
index af1317ff9..0cff3dc9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
 		<springdata.commons>4.1.0-SNAPSHOT</springdata.commons>
 
 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>9.3.4</elasticsearch-java>
-		<elasticsearch-rest-client>9.3.3</elasticsearch-rest-client>
+		<elasticsearch-java>9.4.0</elasticsearch-java>
+		<elasticsearch-rest-client>9.4.0</elasticsearch-rest-client>
 
 		<hoverfly>0.20.2</hoverfly>
 		<log4j>2.25.4</log4j>
diff --git a/src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc b/src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc
index bffc540f4..b59b24f60 100644
--- a/src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc
+++ b/src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc
@@ -4,7 +4,7 @@
 [[new-features.6-1-0]]
 == New in Spring Data Elasticsearch 6.1
 
-* Upgrade to Elasticsearch 9.3.3/ Client 9.3.4
+* Upgrade to Elasticsearch 9.4.0
 * Add support to use `IndexCoordinates` as repository query parameter
 * Add support for includeNamedQueriesScore in Query
 * Add support for Micrometer observation.
diff --git a/src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc b/src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc
index 6dad2fdb5..d72bee094 100644
--- a/src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc
+++ b/src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc
@@ -6,7 +6,7 @@ The following table shows the Elasticsearch and Spring versions that are used by
 [cols="^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
-| 2026.0 | 6.1.x | 9.3.4 | 7.0.x
+| 2026.0 | 6.1.x | 9.4.0 | 7.0.x
 | 2025.1 | 6.0.x | 9.2.2 | 7.0.x
 | 2025.0 | 5.5.x | 8.18.1 | 6.2.x
 | 2024.1 | 5.4.xfootnote:oom[Out of maintenance] | 8.15.5 | 6.1.x
diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java
index fba85f149..851a41b19 100644
--- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java
+++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java
@@ -22,7 +22,7 @@
 import co.elastic.clients.elasticsearch._types.ErrorCause;
 import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
-import co.elastic.clients.elasticsearch.cluster.ComponentTemplateSummary;
+import co.elastic.clients.elasticsearch.cluster.ComponentTemplateSummaryRes;
 import co.elastic.clients.elasticsearch.cluster.GetComponentTemplateResponse;
 import co.elastic.clients.elasticsearch.cluster.HealthResponse;
 import co.elastic.clients.elasticsearch.core.DeleteByQueryResponse;
@@ -133,7 +133,7 @@ private TemplateResponse clusterGetComponentTemplate(
 				.build();
 	}
 
-	private TemplateResponseData clusterGetComponentTemplateData(ComponentTemplateSummary componentTemplateSummary) {
+	private TemplateResponseData clusterGetComponentTemplateData(ComponentTemplateSummaryRes componentTemplateSummary) {
 
 		var mapping = typeMapping(componentTemplateSummary.mappings());
 		var settings = new Settings();
@@ -336,7 +336,7 @@ private TemplateResponse indexGetComponentTemplate(IndexTemplateItem indexTempla
 				.build();
 	}
 
-	private TemplateResponseData indexGetComponentTemplateData(IndexTemplateSummary indexTemplateSummary,
+	private TemplateResponseData indexGetComponentTemplateData(IndexTemplateSummaryWithRollover indexTemplateSummary,
 			List<String> composedOf) {
 		var mapping = typeMapping(indexTemplateSummary.mappings());
 
diff --git a/src/test/resources/testcontainers-elasticsearch.properties b/src/test/resources/testcontainers-elasticsearch.properties
index 2d41836e8..b66b0715e 100644
--- a/src/test/resources/testcontainers-elasticsearch.properties
+++ b/src/test/resources/testcontainers-elasticsearch.properties
@@ -15,7 +15,7 @@
 #
 #
 sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
-sde.testcontainers.image-version=9.3.3
+sde.testcontainers.image-version=9.4.0
 #
 #
 # needed as we do a DELETE /* at the end of the tests, will be required from 8.0 on, produces a warning since 7.13