diff --git a/pom.xml b/pom.xml
index 565738b5bb..0925107f18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,21 +207,6 @@
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-se</artifactId>
-			<classifier>jakarta</classifier>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-spi</artifactId>
-			<classifier>jakarta</classifier>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-impl</artifactId>
-			<classifier>jakarta</classifier>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java
index 86a92c82e8..1d1a18beb6 100644
--- a/src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java
+++ b/src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java
@@ -35,6 +35,7 @@
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Nick Williams
+ * @author Julien Béti
  */
 public class HateoasSortHandlerMethodArgumentResolver extends SortHandlerMethodArgumentResolver
 		implements UriComponentsContributor {
@@ -58,7 +59,7 @@ public TemplateVariables getSortTemplateVariables(MethodParameter parameter, Uri
 
 		String description = String.format("pagination.%s.description", sortParameter);
 		TemplateVariable.VariableType type = append ? REQUEST_PARAM_CONTINUED : REQUEST_PARAM;
-		return new TemplateVariables(new TemplateVariable(sortParameter, type, description));
+		return new TemplateVariables(new TemplateVariable(sortParameter, type, description).composite());
 	}
 
 	@Override
diff --git a/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java
index 5c6c51a182..5baed1f854 100755
--- a/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java
+++ b/src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java
@@ -28,6 +28,7 @@
  * Unit tests for {@link HateoasPageableHandlerMethodArgumentResolver}.
  *
  * @author Oliver Gierke
+ * @author Julien Béti
  */
 class HateoasPageableHandlerMethodArgumentResolverUnitTests
 		extends PageableHandlerMethodArgumentResolverUnitTests {
@@ -69,10 +70,10 @@ void preventsPageSizeFromExceedingMayValueIfConfiguredOnWrite() throws Exception
 	@Test // DATACMNS-418
 	void appendsTemplateVariablesCorrectly() {
 
-		assertTemplateEnrichment("/foo", "{?page,size,sort}");
-		assertTemplateEnrichment("/foo?bar=1", "{&page,size,sort}");
-		assertTemplateEnrichment("/foo?page=1", "{&size,sort}");
-		assertTemplateEnrichment("/foo?page=1&size=10", "{&sort}");
+		assertTemplateEnrichment("/foo", "{?page,size,sort*}");
+		assertTemplateEnrichment("/foo?bar=1", "{&page,size,sort*}");
+		assertTemplateEnrichment("/foo?page=1", "{&size,sort*}");
+		assertTemplateEnrichment("/foo?page=1&size=10", "{&sort*}");
 		assertTemplateEnrichment("/foo?page=1&sort=foo,asc", "{&size}");
 		assertTemplateEnrichment("/foo?page=1&size=10&sort=foo,asc", "");
 	}
@@ -86,7 +87,7 @@ void returnsCustomizedTemplateVariables() {
 		resolver.setPageParameterName("foo");
 		var variables = resolver.getPaginationTemplateVariables(null, uriComponents).toString();
 
-		assertThat(variables).isEqualTo("{?foo,size,sort}");
+		assertThat(variables).isEqualTo("{?foo,size,sort*}");
 	}
 
 	@Test // DATACMNS-563
diff --git a/src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java
index 16563ccb0c..6906511717 100755
--- a/src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java
+++ b/src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java
@@ -28,6 +28,7 @@
  * Unit tests for {@link HateoasSortHandlerMethodArgumentResolver}
  *
  * @author Oliver Gierke
+ * @author Julien Béti
  */
 class HateoasSortHandlerMethodArgumentResolverUnitTests extends SortHandlerMethodArgumentResolverUnitTests {
 
@@ -52,7 +53,7 @@ void returnCorrectTemplateVariables() {
 		var uriComponents = UriComponentsBuilder.fromPath("/").build();
 
 		var resolver = new HateoasSortHandlerMethodArgumentResolver();
-		assertThat(resolver.getSortTemplateVariables(null, uriComponents).toString()).isEqualTo("{?sort}");
+		assertThat(resolver.getSortTemplateVariables(null, uriComponents).toString()).isEqualTo("{?sort*}");
 	}
 
 	private void assertUriStringFor(Sort sort, String expected) throws Exception {