diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
index f7a30c2dc..1ec3fcbc6 100644
--- a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
+++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
@@ -48,6 +48,7 @@ import co.elastic.clients.elasticsearch.core.search.Rescore;
 import co.elastic.clients.elasticsearch.core.search.SearchRequestBody;
 import co.elastic.clients.elasticsearch.core.search.SourceConfig;
 import co.elastic.clients.elasticsearch.indices.*;
+import co.elastic.clients.elasticsearch.indices.ExistsIndexTemplateRequest;
 import co.elastic.clients.elasticsearch.indices.ExistsRequest;
 import co.elastic.clients.elasticsearch.indices.update_aliases.Action;
 import co.elastic.clients.elasticsearch.sql.query.SqlFormat;
@@ -77,15 +78,12 @@ import java.util.stream.Stream;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jspecify.annotations.Nullable;
-
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.core.RefreshPolicy;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.index.AliasAction;
-import org.springframework.data.elasticsearch.core.index.AliasActionParameters;
-import org.springframework.data.elasticsearch.core.index.AliasActions;
+import org.springframework.data.elasticsearch.core.index.*;
 import org.springframework.data.elasticsearch.core.index.DeleteIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.DeleteTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.ExistsTemplateRequest;
@@ -1065,7 +1063,10 @@ class RequestConverter extends AbstractQueryProcessor {
 		return UpdateRequest.of(uqb -> {
 			uqb.index(indexName).id(query.getId());
 
-			if (query.getScript() != null) {
+			var scriptData = query.getScriptData();
+			var script = scriptData != null ? scriptData.script() : null;
+
+			if (script != null) {
 				Map<String, JsonData> params = new HashMap<>();
 
 				if (query.getParams() != null) {
@@ -1073,11 +1074,14 @@ class RequestConverter extends AbstractQueryProcessor {
 				}
 
 				uqb.script(sb -> {
-					sb.lang(query.getLang()).params(params);
-					if (query.getScript() != null) {
-						sb.source(s -> s.scriptString(query.getScript()));
+					sb
+							.lang(scriptData.language())
+							.params(params);
+
+					if (script != null) {
+						sb.source(s -> s.scriptString(script));
 					}
-					sb.id(query.getId());
+					sb.id(scriptData.scriptName());
 
 					return sb;
 				});
@@ -1126,8 +1130,7 @@ class RequestConverter extends AbstractQueryProcessor {
 			}
 
 			return uqb;
-		} //
-		);
+		});
 	}
 
 	public UpdateByQueryRequest documentUpdateByQueryRequest(UpdateQuery updateQuery, IndexCoordinates index,
diff --git a/src/test/java/org/springframework/data/elasticsearch/client/elc/RequestConverterTest.java b/src/test/java/org/springframework/data/elasticsearch/client/elc/RequestConverterTest.java
index bd41df603..ffc6fd3a2 100644
--- a/src/test/java/org/springframework/data/elasticsearch/client/elc/RequestConverterTest.java
+++ b/src/test/java/org/springframework/data/elasticsearch/client/elc/RequestConverterTest.java
@@ -17,6 +17,7 @@ package org.springframework.data.elasticsearch.client.elc;
 
 import static org.assertj.core.api.Assertions.*;
 
+import co.elastic.clients.elasticsearch.core.UpdateRequest;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 
 import java.util.List;
@@ -36,6 +37,7 @@ import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
 import org.springframework.data.elasticsearch.core.query.DeleteQuery;
 import org.springframework.data.elasticsearch.core.query.DocValueField;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
+import org.springframework.data.elasticsearch.core.query.UpdateQuery;
 
 /**
  * @author Peter-Josef Meisch
@@ -96,4 +98,37 @@ class RequestConverterTest {
 		@Nullable
 		@Field(type = FieldType.Text) private String text;
 	}
+
+	@Test // #3231
+	@DisplayName("should not use updatequery id for script id")
+	void shouldNotUseUpdatequeryIdForScriptId() {
+		var updateQuery = UpdateQuery
+				.builder("queryId")
+				.withScript("script")
+				.build();
+
+		UpdateRequest<org.springframework.data.elasticsearch.core.document.Document, ?> updateRequest = requestConverter
+				.documentUpdateRequest(updateQuery, IndexCoordinates.of("foo"), null, null);
+
+		assertThat(updateRequest.id()).isEqualTo("queryId");
+		assertThat(updateRequest.script().source().scriptString()).isEqualTo("script");
+		assertThat(updateRequest.script().id()).isNull();
+	}
+
+	@Test // #3231
+	@DisplayName("should use script name as update query id")
+	void shouldUseScriptNameAsUpdateQueryId() {
+		var updateQuery = UpdateQuery
+				.builder("queryId")
+				.withScript("script")
+				.withScriptName("scriptName")
+				.build();
+
+		UpdateRequest<org.springframework.data.elasticsearch.core.document.Document, ?> updateRequest = requestConverter
+				.documentUpdateRequest(updateQuery, IndexCoordinates.of("foo"), null, null);
+
+		assertThat(updateRequest.id()).isEqualTo("queryId");
+		assertThat(updateRequest.script().source().scriptString()).isEqualTo("script");
+		assertThat(updateRequest.script().id()).isEqualTo("scriptName");
+	}
 }