Revert "Revert collect(Collectors.toList())"

312 files changed, 465 insertions, 466 deletions

diff --git a/abi-check-plugin/src/main/java/com/yahoo/abicheck/collector/PublicSignatureCollector.java b/abi-check-plugin/src/main/java/com/yahoo/abicheck/collector/PublicSignatureCollector.java
index 737a2724fc8..38fad30a5d7 100644
--- a/abi-check-plugin/src/main/java/com/yahoo/abicheck/collector/PublicSignatureCollector.java
+++ b/abi-check-plugin/src/main/java/com/yahoo/abicheck/collector/PublicSignatureCollector.java
@@ -71,7 +71,7 @@ public class PublicSignatureCollector extends ClassVisitor {
     if (isVisibleMember(access)) {
       Type method = Type.getMethodType(descriptor);
       List<String> argumentTypes = Arrays.stream(method.getArgumentTypes()).map(Type::getClassName)
-          .collect(Collectors.toList());
+          .toList();
       currentMethods
           .add(describeMethod(name, access, method.getReturnType().getClassName(), argumentTypes));
     }
diff --git a/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java b/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java
index 27b20701333..714fe9ba18f 100644
--- a/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java
+++ b/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java
@@ -144,7 +144,7 @@ public class AbiCheck extends AbstractMojo {
     if (isPublicAbiPackage(pkg, publicApiAnnotation)) {
       PublicSignatureCollector collector = new PublicSignatureCollector();
       List<ClassFileTree.ClassFile> sortedClassFiles = pkg.getClassFiles().stream()
-          .sorted(Comparator.comparing(ClassFile::getName)).collect(Collectors.toList());
+          .sorted(Comparator.comparing(ClassFile::getName)).toList();
       for (ClassFile klazz : sortedClassFiles) {
         try (InputStream is = klazz.getInputStream()) {
           new ClassReader(is).accept(collector, 0);
@@ -154,7 +154,7 @@ public class AbiCheck extends AbstractMojo {
     }
     List<ClassFileTree.Package> sortedSubPackages = pkg.getSubPackages().stream()
         .sorted(Comparator.comparing(Package::getFullyQualifiedName))
-        .collect(Collectors.toList());
+        .toList();
     for (ClassFileTree.Package subPkg : sortedSubPackages) {
       signatures.putAll(collectPublicAbiSignatures(subPkg, publicApiAnnotation));
     }
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidatorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidatorTest.java
index c3e4ba44fc8..2b5165a815a 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidatorTest.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/InstanceValidatorTest.java
@@ -248,7 +248,7 @@ public class InstanceValidatorTest {
     private ApplicationInfo mockApplicationInfo(ApplicationId appId, int numHosts, List<ServiceInfo> serviceInfo) {
         List<HostInfo> hosts = IntStream.range(0, numHosts)
                 .mapToObj(i -> new HostInfo("host-" + i + "." + appId.toShortString() + ".yahoo.com", serviceInfo))
-                .collect(Collectors.toList());
+                .toList();
 
         Model model = mock(Model.class);
         when(model.getHosts()).thenReturn(hosts);
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractGenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractGenerateOsgiManifestMojo.java
index e058e0dfa6f..00c915b8b91 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractGenerateOsgiManifestMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractGenerateOsgiManifestMojo.java
@@ -138,7 +138,7 @@ abstract class AbstractGenerateOsgiManifestMojo extends AbstractMojo {
 
     private Collection<String> osgiExportPackages(Map<String, ExportPackageAnnotation> exportedPackages) {
         return exportedPackages.entrySet().stream().map(entry -> entry.getKey() + ";version=" + entry.getValue().osgiVersion())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static String asOsgiImport(String packageName, Optional<String> version) {
@@ -189,7 +189,7 @@ abstract class AbstractGenerateOsgiManifestMojo extends AbstractMojo {
         } else if (parameters.size() == 0) {
             return Optional.empty();
         } else {
-            List<String> paramNames = parameters.stream().map(ExportPackages.Parameter::getName).collect(Collectors.toList());
+            List<String> paramNames = parameters.stream().map(ExportPackages.Parameter::getName).toList();
             throw new RuntimeException("A single, optional version parameter expected, but got " + paramNames);
         }
     }
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
index 7e5ba3d91ce..f5d3259c537 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
@@ -70,7 +70,7 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
                 throwIfInternalContainerArtifactsAreIncluded(artifactSet.getJarArtifactsToInclude());
 
             List<Export> exportedPackagesFromProvidedJars = exportedPackagesAggregated(
-                    artifactSet.getJarArtifactsProvided().stream().map(Artifact::getFile).collect(Collectors.toList()));
+                    artifactSet.getJarArtifactsProvided().stream().map(Artifact::getFile).toList());
 
             // Packages from Export-Package headers in provided scoped jars
             Set<String> exportedPackagesFromProvidedDeps = ExportPackages.packageNames(exportedPackagesFromProvidedJars);
@@ -182,7 +182,7 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
 
     private void warnOnUnsupportedArtifacts(Collection<Artifact> nonJarArtifacts) {
         List<Artifact> unsupportedArtifacts = nonJarArtifacts.stream().filter(a -> ! a.getType().equals("pom"))
-                .collect(Collectors.toList());
+                .toList();
 
         unsupportedArtifacts.forEach(artifact -> getLog()
                 .warn(String.format("Unsupported artifact '%s': Type '%s' is not supported. Please file a feature request.",
@@ -215,7 +215,7 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
         List<ClassFileMetaData> analyzedClasses = allDescendantFiles(outputDirectory)
                 .filter(file -> file.getName().endsWith(".class"))
                 .map(classFile -> Analyze.analyzeClass(classFile, artifactVersionOrNull(bundleVersion)))
-                .collect(Collectors.toList());
+                .toList();
 
         return PackageTally.fromAnalyzedClassFiles(analyzedClasses);
     }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
index 695fecb6314..5d9ec6f5f80 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
@@ -144,7 +144,7 @@ public class ContentCluster {
                                     Objects.equals(userWantedState.getDescription(), ORCHESTRATOR_RESERVED_DESCRIPTION);
                         })
                                   .map(NodeInfo::getNodeIndex)
-                                  .collect(Collectors.toList());
+                                  .toList();
             default:
                 // Note: There is no trace left if the Orchestrator set the state to UP, so that's handled
                 // like any other state:
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
index 004cefe1e3c..0efba56284b 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
@@ -191,7 +191,7 @@ public class SystemStateBroadcaster {
         return dbContext.getCluster().getNodeInfos().stream()
                         .filter(this::nodeNeedsClusterStateBundle)
                         .filter(node -> !newestStateBundleAlreadySentToNode(node))
-                        .collect(Collectors.toList());
+                        .toList();
     }
 
     // Precondition: no nodes in the cluster need to receive the current cluster state version bundle
@@ -199,7 +199,7 @@ public class SystemStateBroadcaster {
         return dbContext.getCluster().getNodeInfos().stream()
                         .filter(this::nodeNeedsClusterStateActivation)
                         .filter(node -> !newestStateActivationAlreadySentToNode(node))
-                        .collect(Collectors.toList());
+                        .toList();
     }
 
     private boolean newestStateBundleAlreadySentToNode(NodeInfo node) {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java
index d840529d361..363eec4e8e4 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java
@@ -219,7 +219,7 @@ public class VdsClusterHtmlRenderer {
             if (stateBundle.clusterFeedIsBlocked()) {
                 var exhaustions = stateBundle.getFeedBlockOrNull().getConcreteExhaustions().stream()
                         .filter(ex -> ex.node.getIndex() == nodeInfo.getNodeIndex())
-                        .collect(Collectors.toList());
+                        .toList();
                 if (!exhaustions.isEmpty()) {
                     var exhaustionsDesc = exhaustions.stream()
                             .map(NodeResourceExhaustion::toShorthandDescription)
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBuilder.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBuilder.java
index a7278be548f..652991a6f36 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBuilder.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBuilder.java
@@ -23,13 +23,13 @@ public class DistributionBuilder {
         GroupBuilder(int... nodeCounts) {
             this.groupCount = nodeCounts.length;
             this.groupsWithNodeCount = IntStream.of(nodeCounts).boxed()
-                    .collect(Collectors.toList());
+                    .toList();
         }
 
         GroupBuilder eachWithNodeCount(int nodeCount) {
             groupsWithNodeCount = IntStream.range(0, groupCount)
                     .map(i -> nodeCount).boxed()
-                    .collect(Collectors.toList());
+                    .toList();
             return this;
         }
 
@@ -54,7 +54,7 @@ public class DistributionBuilder {
     static List<ConfiguredNode> buildConfiguredNodes(int nodeCount) {
         return IntStream.range(0, nodeCount)
                 .mapToObj(i -> new ConfiguredNode(i, false))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static StorDistributionConfig.Group.Nodes.Builder configuredNode(ConfiguredNode node) {
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
index 5981c2a1cf6..36fe5321788 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
@@ -258,7 +258,7 @@ public class DummyVdsNode {
         synchronized(timer) {
             return clusterStateBundles.stream()
                     .map(ClusterStateBundle::getBaselineClusterState)
-                    .collect(Collectors.toList());
+                    .toList();
         }
     }
 
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index f7efbd2cc3b..e8b56cbc142 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -241,7 +241,7 @@ public abstract class FleetControllerTest implements Waiter {
             public List<DummyVdsNode> getDummyNodes() {
                 return nodes.stream()
                         .filter(n -> !excludedNodes.contains(n.getNode().getIndex()))
-                        .collect(Collectors.toList());
+                        .toList();
             }
             @Override
             public Duration getTimeout() { return timeout; }
diff --git a/config-lib/src/main/java/com/yahoo/config/UrlNode.java b/config-lib/src/main/java/com/yahoo/config/UrlNode.java
index ace94f561ff..f871b990c6e 100644
--- a/config-lib/src/main/java/com/yahoo/config/UrlNode.java
+++ b/config-lib/src/main/java/com/yahoo/config/UrlNode.java
@@ -56,7 +56,7 @@ public class UrlNode extends LeafNode<File> {
     }
 
     public static List<UrlReference> toUrlReferences(List<UrlNode> urlNodes) {
-        return urlNodes.stream().map(UrlNode::getUrlReference).collect(Collectors.toList());
+        return urlNodes.stream().map(UrlNode::getUrlReference).toList();
     }
 
     public static Map<String, UrlReference> toUrlReferenceMap(Map<String, UrlNode> urlNodeMap) {
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
index f69bd5fa475..6c519a4656e 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
@@ -222,7 +222,7 @@ public class DeploymentSpec {
     private static List<DeploymentInstanceSpec> instances(List<DeploymentSpec.Step> steps) {
         return steps.stream()
                     .flatMap(DeploymentSpec::flatten)
-                    .collect(Collectors.toList());
+                    .toList();
     }
 
     private static Stream<DeploymentInstanceSpec> flatten(Step step) {
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java b/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java
index 746d7226d82..8256237dc43 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java
@@ -79,7 +79,7 @@ public class TimeWindow {
                hours.toString() +
                " on " + days.stream().map(DayOfWeek::name)
                             .map(String::toLowerCase)
-                            .collect(Collectors.toList()) +
+                            .toList() +
                " in time zone " + zone + " and " + dateRange.toString();
     }
 
@@ -90,7 +90,7 @@ public class TimeWindow {
                 ? List.copyOf(dateRange.days()) // Default to the days contained in the date range
                 : parse(daySpec, TimeWindow::parseDays);
         List<Integer> hours = hourSpec.isEmpty()
-                ? IntStream.rangeClosed(0, 23).boxed().collect(Collectors.toList()) // All hours by default
+                ? IntStream.rangeClosed(0, 23).boxed().toList() // All hours by default
                 : parse(hourSpec, TimeWindow::parseHours);
         ZoneId zone = zoneFrom(zoneSpec.isEmpty() ? "UTC" : zoneSpec);
         return new TimeWindow(days, hours, zone, dateRange);
@@ -123,7 +123,7 @@ public class TimeWindow {
                                                              endInclusive));
         }
         return IntStream.rangeClosed(start, end).boxed()
-                        .collect(Collectors.toList());
+                        .toList();
     }
 
     /** Returns a list of all days occurring between startInclusive and endInclusive */
@@ -136,7 +136,7 @@ public class TimeWindow {
         }
         return IntStream.rangeClosed(start.getValue(), end.getValue()).boxed()
                         .map(DayOfWeek::of)
-                        .collect(Collectors.toList());
+                        .toList();
     }
 
     /** Parse day of week from string */
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
index c1ecddee456..8182e697e7e 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
@@ -215,7 +215,7 @@ public class DeploymentSpecXmlReader {
                                                              notifications,
                                                              endpoints,
                                                              now))
-                     .collect(Collectors.toList());
+                     .toList();
     }
 
     private List<Step> readSteps(Element stepTag, Map<String, String> prodAttributes, Element parentTag) {
@@ -250,7 +250,7 @@ public class DeploymentSpecXmlReader {
             case prodTag: // regions, delay and parallel may be nested within, but we can flatten them
                 return XML.getChildren(stepTag).stream()
                                                .flatMap(child -> readNonInstanceSteps(child, prodAttributes, stepTag).stream())
-                                               .collect(Collectors.toList());
+                                               .toList();
             case delayTag:
                 return List.of(new Delay(Duration.ofSeconds(longAttribute("hours", stepTag) * 60 * 60 +
                                                             longAttribute("minutes", stepTag) * 60 +
@@ -258,11 +258,11 @@ public class DeploymentSpecXmlReader {
             case parallelTag: // regions and instances may be nested within
                 return List.of(new ParallelSteps(XML.getChildren(stepTag).stream()
                                                     .flatMap(child -> readSteps(child, prodAttributes, parentTag).stream())
-                                                    .collect(Collectors.toList())));
+                                                    .toList()));
             case stepsTag: // regions and instances may be nested within
                 return List.of(new Steps(XML.getChildren(stepTag).stream()
                                             .flatMap(child -> readSteps(child, prodAttributes, parentTag).stream())
-                                            .collect(Collectors.toList())));
+                                            .toList()));
             case regionTag:
                 return List.of(readDeclaredZone(Environment.prod, athenzService, testerFlavor, stepTag));
             default:
@@ -378,7 +378,7 @@ public class DeploymentSpecXmlReader {
      * Imposes some constraints on tag order which are not expressible in the schema
      */
     private void validateTagOrder(Element root) {
-        List<String> tags = XML.getChildren(root).stream().map(Element::getTagName).collect(Collectors.toList());
+        List<String> tags = XML.getChildren(root).stream().map(Element::getTagName).toList();
         for (int i = 0; i < tags.size(); i++) {
             if (tags.get(i).equals(blockChangeTag)) {
                 String constraint = "<block-change> must be placed after <test> and <staging> and before <prod>";
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index d6af531ff89..96cd4810ec4 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -1235,12 +1235,12 @@ public class DeploymentSpecTest {
 
         assertEquals(
                 List.of("foo", "nalle", "default"),
-                spec.requireInstance("default").endpoints().stream().map(Endpoint::endpointId).collect(Collectors.toList())
+                spec.requireInstance("default").endpoints().stream().map(Endpoint::endpointId).toList()
         );
 
         assertEquals(
                 List.of("bar", "frosk", "quux"),
-                spec.requireInstance("default").endpoints().stream().map(Endpoint::containerId).collect(Collectors.toList())
+                spec.requireInstance("default").endpoints().stream().map(Endpoint::containerId).toList()
         );
 
         assertEquals(List.of(RegionName.from("us-east")), spec.requireInstance("default").endpoints().get(0).regions());
@@ -1677,7 +1677,7 @@ public class DeploymentSpecTest {
 
         return DeploymentSpec.fromXml(xml).requireInstance("default").endpoints().stream()
                              .map(Endpoint::endpointId)
-                             .collect(Collectors.toList());
+                             .toList();
     }
 
 }
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
index e822b42a909..6ff5616a80f 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
@@ -670,12 +670,12 @@ public class DeploymentSpecWithoutInstanceTest {
 
         assertEquals(
                 List.of("foo", "nalle", "default"),
-                spec.requireInstance("default").endpoints().stream().map(Endpoint::endpointId).collect(Collectors.toList())
+                spec.requireInstance("default").endpoints().stream().map(Endpoint::endpointId).toList()
         );
 
         assertEquals(
                 List.of("bar", "frosk", "quux"),
-                spec.requireInstance("default").endpoints().stream().map(Endpoint::containerId).collect(Collectors.toList())
+                spec.requireInstance("default").endpoints().stream().map(Endpoint::containerId).toList()
         );
 
         assertEquals(List.of(RegionName.from("us-east")), spec.requireInstance("default").endpoints().get(0).regions());
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java
index 2403066868b..6a939aea574 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java
@@ -114,7 +114,7 @@ public class TimeWindowTest {
         { // Empty results in default values
             TimeWindow tw = TimeWindow.from("", "", "", "", "");
             assertEquals(List.of(DayOfWeek.values()), tw.days());
-            assertEquals(IntStream.rangeClosed(0, 23).boxed().collect(Collectors.toList()), tw.hours());
+            assertEquals(IntStream.rangeClosed(0, 23).boxed().toList(), tw.hours());
             assertEquals("UTC", tw.zone().getId());
         }
         {
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
index d2fd6d8cfc4..f44849e185f 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
@@ -127,11 +127,11 @@ public class InMemoryProvisioner implements HostProvisioner {
     }
 
     private static Collection<Host> toHostInstances(String[] hostnames) {
-        return Arrays.stream(hostnames).map(Host::new).collect(Collectors.toList());
+        return Arrays.stream(hostnames).map(Host::new).toList();
     }
 
     private static Collection<Host> createHostInstances(int hostCount) {
-        return IntStream.range(1, hostCount + 1).mapToObj(i -> new Host("host" + i)).collect(Collectors.toList());
+        return IntStream.range(1, hostCount + 1).mapToObj(i -> new Host("host" + i)).toList();
     }
 
     /** Returns the current allocations of this as a mutable map */
@@ -265,7 +265,7 @@ public class InMemoryProvisioner implements HostProvisioner {
     }
 
     private List<HostSpec> nonRetiredIn(List<HostSpec> hosts) {
-        return hosts.stream().filter(host -> ! retiredHostNames.contains(host.hostname())).collect(Collectors.toList());
+        return hosts.stream().filter(host -> ! retiredHostNames.contains(host.hostname())).toList();
     }
 
     private int totalAllocatedTo(ClusterSpec cluster) {
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java b/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java
index 1ce1c48c0f1..c3531d03d3f 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/AttributeFields.java
@@ -167,7 +167,7 @@ public class AttributeFields extends Derived implements AttributesConfig.Produce
         String structPrefix = baseFieldName + ".";
         return attributes().stream()
                 .filter(attribute -> attribute.getName().startsWith(structPrefix))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public String toString() {
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java b/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java
index 6dae89bf692..a35bc735608 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java
@@ -76,7 +76,7 @@ public final class IndexingScript extends Derived implements IlscriptsConfig.Pro
         return schema.allFieldsList().stream()
                      .filter(field -> ! field.isImportedField())
                      .filter(field -> field.containsExpression(SetLanguageExpression.class))
-                     .collect(Collectors.toList());
+                     .toList();
     }
 
     public Iterable<Expression> expressions() {
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
index 8bdbe574b0e..0231e0e3c3f 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
@@ -194,7 +194,7 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
             rankProperties = new ArrayList<>(compiled.getRankProperties());
 
             Map<String, RankProfile.RankingExpressionFunction> functions = compiled.getFunctions();
-            List<ExpressionFunction> functionExpressions = functions.values().stream().map(RankProfile.RankingExpressionFunction::function).collect(Collectors.toList());
+            List<ExpressionFunction> functionExpressions = functions.values().stream().map(RankProfile.RankingExpressionFunction::function).toList();
             Map<String, String> functionProperties = new LinkedHashMap<>();
             SerializationContext functionSerializationContext = new SerializationContext(functionExpressions,
                                                                                          Map.of(),
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
index 2de7e5a1b37..48b804dfe6c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
@@ -119,7 +119,7 @@ public class HostSystem extends AbstractConfigProducer<Host> {
     public List<HostResource> getHosts() {
         return hostname2host.values().stream()
                 .filter(host -> !host.getHost().runsConfigServer())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public void dumpPortAllocations() {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
index 1a17b082263..97a6f27b759 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
@@ -40,7 +40,7 @@ class ConsumersConfigGenerator {
 
         return allConsumers.values().stream()
                 .map(ConsumersConfigGenerator::toConsumerBuilder)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /*
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java
index b56c5f6c216..678f458dff0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsNodesConfigGenerator.java
@@ -17,7 +17,7 @@ public class MetricsNodesConfigGenerator {
     public static List<MetricsNodesConfig.Node.Builder> generate(List<MetricsProxyContainer> containers) {
         return containers.stream()
                 .map(MetricsNodesConfigGenerator::toNodeBuilder)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static MetricsNodesConfig.Node.Builder toNodeBuilder(MetricsProxyContainer container) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/VespaServicesConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/VespaServicesConfigGenerator.java
index 93ff9f8963c..f8a91b7d3e9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/VespaServicesConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/VespaServicesConfigGenerator.java
@@ -17,7 +17,7 @@ public class VespaServicesConfigGenerator {
         return services.stream()
                 .filter(VespaServicesConfigGenerator::doIncludeServiceMetrics)
                 .map(VespaServicesConfigGenerator::toServiceBuilder)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static boolean doIncludeServiceMetrics(Service s) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
index 1e3b27bc2fa..c8a8df18f98 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java
@@ -105,7 +105,7 @@ public class BundleValidator extends AbstractBundleValidator {
             this.name = name;
             this.javaPackageMatchers = javaPackagePatterns.stream()
                 .map(s -> Pattern.compile(s).asMatchPredicate())
-                .collect(Collectors.toList());
+                .toList();
             this.versionDiscriminator = versionDiscriminator;
             this.description = description;
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java
index da470f804d9..4ea74147aaf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/QuotaValidator.java
@@ -76,7 +76,7 @@ public class QuotaValidator extends Validator {
                 })
                 .map(Map.Entry::getKey)
                 .map(ClusterSpec.Id::value)
-                .collect(Collectors.toList());
+                .toList();
 
         if (!invalidClusters.isEmpty()) {
             var clusterNames = String.join(", ", invalidClusters);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java
index 9360c6e707b..077855b4b23 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidator.java
@@ -42,7 +42,7 @@ public class ConfigValueChangeValidator implements ChangeValidator {
     @Override
     public List<ConfigChangeAction> validate(VespaModel currentModel, VespaModel nextModel,
                                              ValidationOverrides overrides, Instant now) {
-        return findConfigChangesFromModels(currentModel, nextModel).collect(Collectors.toList());
+        return findConfigChangesFromModels(currentModel, nextModel).toList();
     }
 
     public Stream<ConfigChangeAction> findConfigChangesFromModels(AbstractConfigProducerRoot currentModel,
@@ -57,7 +57,7 @@ public class ConfigValueChangeValidator implements ChangeValidator {
                                                                           AbstractConfigProducerRoot currentModel,
                                                                           AbstractConfigProducerRoot nextModel) {
         List<ChangesRequiringRestart> changes = findConfigChangesForService(service, currentModel, nextModel)
-            .collect(Collectors.toList());
+            .toList();
         if (changes.isEmpty()) {
             return Optional.empty();
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java
index 7ee5fe8edf6..3a0b1348d7e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidator.java
@@ -31,7 +31,7 @@ public class ContainerRestartValidator implements ChangeValidator {
                                   .filter(container -> isExistingContainer(container, currentModel))
                                   .filter(container -> shouldContainerRestartOnDeploy(container, nextModel))
                                   .map(container -> createConfigChangeAction(cluster.id(), container))
-                                  .collect(Collectors.toList()));
+                                  .toList());
         }
         return actions;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
index a3872d9354b..4acdda03166 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidator.java
@@ -73,7 +73,7 @@ public class IndexingModeChangeValidator implements ChangeValidator {
             if (currentTypes.contains(type)) {
                 List<ServiceInfo> services = nextCluster.getSearch().getSearchNodes().stream()
                         .map(SearchNode::getServiceInfo)
-                        .collect(Collectors.toList());
+                        .toList();
                 actions.add(VespaReindexAction.of(
                         nextCluster.id(),
                         ValidationId.indexModeChange,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java
index 8537bb2462f..6486b5aff1b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidator.java
@@ -53,7 +53,7 @@ public class ResourcesReductionValidator implements ChangeValidator {
                                  current.minResources().nodeResources().diskGb(),
                                  next.minResources().nodeResources().diskGb()))
                 .flatMap(Optional::stream)
-                .collect(Collectors.toList());
+                .toList();
         if (illegalChanges.isEmpty()) return;
 
         overrides.invalid(ValidationId.resourcesReduction,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidator.java
index 6b5ae4d4c5c..1f5a54d6b0f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidator.java
@@ -26,7 +26,7 @@ public class StartupCommandChangeValidator implements ChangeValidator {
     @Override
     public List<ConfigChangeAction> validate(VespaModel currentModel, VespaModel nextModel,
                                              ValidationOverrides overrides, Instant now) {
-        return findServicesWithChangedStartupCommand(currentModel, nextModel).collect(Collectors.toList());
+        return findServicesWithChangedStartupCommand(currentModel, nextModel).toList();
     }
 
     public Stream<ConfigChangeAction> findServicesWithChangedStartupCommand(AbstractConfigProducerRoot currentModel,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index dae2f7e8cb8..d27f78f6a8a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -165,7 +165,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
                                                                      .filter(container -> retired == container.isRetired())
                                                                      .map(Container::getHostResource)
                                                                      .sorted(HostResource::comparePrimarilyByIndexTo)
-                                                                     .collect(Collectors.toList());
+                                                                     .collect(Collectors.toCollection(ArrayList::new));
         return hosts.subList(0, Math.min(count, hosts.size()));
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index 9ebaa4f0fd6..c097f856da2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -198,7 +198,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         List<String> hosts = getContainers().stream()
                 .map(AbstractService::getHostName)
                 .sorted()
-                .collect(Collectors.toList());
+                .toList();
 
         for (String suffix : deployState.getProperties().zoneDnsSuffixes()) {
             ApplicationClusterEndpoint.DnsName l4Name = ApplicationClusterEndpoint.DnsName.sharedL4NameFrom(
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java
index 039daba8ad0..901c0877c1f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java
@@ -43,7 +43,7 @@ public class BlockFeedGlobalEndpointsFilter extends Filter implements RuleBasedF
                 .flatMap(e -> e.names().stream())
                 .collect(Collectors.toCollection(() -> new LinkedHashSet<>()));
         if(hostNames.size() > 0) {
-            Collection<String> hostnamesSorted = hostNames.stream().sorted().collect(Collectors.toList());
+            Collection<String> hostnamesSorted = hostNames.stream().sorted().toList();
             RuleBasedFilterConfig.Rule.Builder rule = new RuleBasedFilterConfig.Rule.Builder()
                     .hostNames(hostnamesSorted)
                     .pathExpressions(ContainerCluster.RESERVED_URI_PREFIX + "/{*}")
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
index cb52f701da4..4aa0386bd27 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
@@ -92,9 +92,9 @@ public class HostedSslConnectorFactory extends ConnectorFactory {
         connectorBuilder.ssl.enabledProtocols(List.of("TLSv1.2"));
 
         if (!tlsCiphersOverride.isEmpty()) {
-            connectorBuilder.ssl.enabledCipherSuites(tlsCiphersOverride.stream().sorted().collect(Collectors.toList()));
+            connectorBuilder.ssl.enabledCipherSuites(tlsCiphersOverride.stream().sorted().toList());
         } else {
-            connectorBuilder.ssl.enabledCipherSuites(TlsContext.ALLOWED_CIPHER_SUITES.stream().sorted().collect(Collectors.toList()));
+            connectorBuilder.ssl.enabledCipherSuites(TlsContext.ALLOWED_CIPHER_SUITES.stream().sorted().toList());
         }
 
         connectorBuilder
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java
index 834b0e73b5e..ce999603439 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/SemanticRuleBuilder.java
@@ -23,7 +23,7 @@ public class SemanticRuleBuilder {
         List<NamedReader> ruleBaseFiles = null;
         try {
             ruleBaseFiles = applicationPackage.getFiles(ApplicationPackage.RULES_DIR, "sr");
-            return new SemanticRules(ruleBaseFiles.stream().map(this::toRuleBaseConfigView).collect(Collectors.toList()));
+            return new SemanticRules(ruleBaseFiles.stream().map(this::toRuleBaseConfigView).toList());
         }
         finally {
             NamedReader.closeAll(ruleBaseFiles);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudSecretStore.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudSecretStore.java
index 373eb9714d3..b43c7777dec 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudSecretStore.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudSecretStore.java
@@ -41,7 +41,7 @@ public class CloudSecretStore extends SimpleComponent implements SecretStoreConf
                         .awsId(config.awsId)
                         .role(config.role)
                         .externalId(config.externalId)
-                ).collect(Collectors.toList())
+                ).toList()
         );
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index a78750ded02..159ab26414d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -1244,7 +1244,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                                                 .filter(option -> !option.isEmpty())
                                                 .filter(option -> !Pattern.matches(validPattern.pattern(), option))
                                                 .sorted()
-                                                .collect(Collectors.toList());
+                                                .collect(Collectors.toCollection(ArrayList::new));
             if (isHosted)
                 invalidOptions.addAll(Arrays.stream(optionList)
                         .filter(option -> !option.isEmpty())
@@ -1291,17 +1291,12 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                 options = jvmGcOptions;
                 String[] optionList = options.split(" ");
                 List<String> invalidOptions = Arrays.stream(optionList)
-                                                    .filter(option -> !option.isEmpty())
-                                                    .filter(option -> !Pattern.matches(validPattern.pattern(), option))
-                                                    .collect(Collectors.toList());
-
-                if (isHosted) {
-                    // CMS GC options cannot be used in hosted, CMS is unsupported in JDK 17
-                    invalidOptions.addAll(Arrays.stream(optionList)
-                            .filter(option -> !option.isEmpty())
-                            .filter(option -> Pattern.matches(invalidCMSPattern.pattern(), option) ||
-                                    option.equals("-XX:+UseConcMarkSweepGC")).toList());
-                }
+                        .filter(option -> !option.isEmpty())
+                        .filter(option -> !Pattern.matches(validPattern.pattern(), option)
+                                || Pattern.matches(invalidCMSPattern.pattern(), option)
+                                || option.equals("-XX:+UseConcMarkSweepGC"))
+                        .sorted()
+                        .toList();
 
                 logOrFailInvalidOptions(invalidOptions);
             }
@@ -1315,7 +1310,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         private void logOrFailInvalidOptions(List<String> options) {
             if (options.isEmpty()) return;
 
-            Collections.sort(options);
             String message = "Invalid or misplaced JVM GC options in services.xml: " +
                     String.join(",", options) + "." +
                     " See https://docs.vespa.ai/en/reference/services-container.html#jvm";
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index 9379e69e278..60ab5dacc5f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -355,7 +355,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
     private List<NewDocumentType> documentTypes(Predicate<NewDocumentType> filter) {
         return documentDefinitions.values().stream()
                 .filter(filter)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private boolean hasIndexingModeStreaming(NewDocumentType type) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java
index f74134f26f4..8f16d60d5a1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidator.java
@@ -20,7 +20,7 @@ public class ReservedDocumentTypeNameValidator {
     public void validate(Map<String, NewDocumentType> documentDefinitions) {
         List<String> conflictingNames = documentDefinitions.keySet().stream()
                 .filter(this::isReservedName)
-                .collect(Collectors.toList());
+                .toList();
         if (!conflictingNames.isEmpty()) {
             throw new IllegalArgumentException(makeReservedNameMessage(conflictingNames));
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
index 96a6b39dc1a..ea7d1620fd9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
@@ -173,7 +173,7 @@ public class ConvertedModel {
 
         if (arguments.output().isEmpty()) {
             List<Map.Entry<String, ExpressionFunction>> entriesWithTheRightPrefix =
-                    expressions.entrySet().stream().filter(entry -> entry.getKey().startsWith(arguments.signature().get() + ".")).collect(Collectors.toList());
+                    expressions.entrySet().stream().filter(entry -> entry.getKey().startsWith(arguments.signature().get() + ".")).toList();
             if (entriesWithTheRightPrefix.size() < 1)
                 throw new IllegalArgumentException("No expressions named '" + arguments.signature().get() +
                                                    missingExpressionMessageSuffix());
@@ -416,7 +416,7 @@ public class ConvertedModel {
             CompositeNode composite = (CompositeNode)node;
             return composite.setChildren(composite.children().stream()
                                                   .map(child -> replaceConstantsByFunctions(child, constantsReplacedByFunctions))
-                                                  .collect(Collectors.toList()));
+                                                  .toList());
         }
         return node;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
index 0fe8a1b837a..71f2eff8651 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
@@ -60,7 +60,7 @@ public abstract class SearchCluster extends AbstractConfigProducer<SearchCluster
         return schemas.values()
                       .stream()
                       .map(schema -> schema.fullSchema().getDocument().getDocumentName().getName())
-                      .collect(Collectors.toList());
+                      .toList();
     }
 
     public String getClusterName()              { return clusterName; }
diff --git a/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java
index b5007bba494..268e0b17b24 100644
--- a/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/SummaryTestCase.java
@@ -175,7 +175,7 @@ public class SummaryTestCase {
         tests.forEach(testValue -> {
             var actualFields = testValue.summary.getSummaryFields().values().stream()
                     .map(FieldBase::getName)
-                    .collect(Collectors.toList());
+                    .toList();
             assertEquals(Optional.ofNullable(testValue.parent),
                     testValue.summary.inherited(),
                     testValue.summary.getName() + (testValue.parent == null ? " does not inherit anything" : " inherits " + testValue.parent.getName()));
@@ -278,7 +278,7 @@ public class SummaryTestCase {
         public TestValue(DocumentSummary summary, DocumentSummary parent, List<List<String>> fields) {
             this.summary = summary;
             this.parent = parent;
-            this.fields = fields.stream().flatMap(Collection::stream).collect(Collectors.toList());;
+            this.fields = fields.stream().flatMap(Collection::stream).toList();;
         }
 
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
index a08023f2e10..9705bc83e2b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
@@ -161,7 +161,7 @@ public class ConfigValueChangeValidatorTest {
     private List<ConfigChangeAction> getConfigChanges(AbstractConfigProducerRoot currentModel,
                                                       AbstractConfigProducerRoot nextModel) {
         ConfigValueChangeValidator validator = new ConfigValueChangeValidator(logger);
-        return validator.findConfigChangesFromModels(currentModel, nextModel).collect(Collectors.toList());
+        return validator.findConfigChangesFromModels(currentModel, nextModel).toList();
     }
 
     private static void assertComponentsEquals(List<ConfigChangeAction> changes, String name, int index) {
@@ -219,7 +219,7 @@ public class ConfigValueChangeValidatorTest {
     private static List<String> createSchemas(List<String> docTypes) {
         return docTypes.stream()
                 .map(type -> "search " + type + " { document " + type + " { } }")
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static String createQrStartConfigSegment(boolean verboseGc, int heapsize) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
index 8d906259835..5d0a1704a1d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
@@ -70,7 +70,7 @@ public class IndexingModeChangeValidatorTest {
     private void assertReindexingChange(String message, List<ConfigChangeAction> changeActions) {
         List<ConfigChangeAction> reindexingActions = changeActions.stream()
                                                               .filter(a -> a instanceof ConfigChangeReindexAction)
-                                                              .collect(Collectors.toList());
+                                                              .toList();
         assertEquals(1, reindexingActions.size());
         assertTrue(reindexingActions.get(0) instanceof ConfigChangeReindexAction);
         assertEquals("indexing-mode-change", ((ConfigChangeReindexAction)reindexingActions.get(0)).name());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java
index 827aee42b0e..16687af5a9f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/StartupCommandChangeValidatorTest.java
@@ -49,7 +49,7 @@ public class StartupCommandChangeValidatorTest {
     private static List<ConfigChangeAction> getStartupCommandChanges(
             AbstractConfigProducerRoot currentModel, AbstractConfigProducerRoot nextModel) {
         StartupCommandChangeValidator validator = new StartupCommandChangeValidator();
-        return validator.findServicesWithChangedStartupCommand(currentModel, nextModel).collect(Collectors.toList());
+        return validator.findServicesWithChangedStartupCommand(currentModel, nextModel).toList();
     }
 
     private static MockRoot createRootWithChildren(AbstractConfigProducer<?>... children) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index 23b576be8b3..500843a82a0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -337,7 +337,7 @@ public class ContainerClusterTest {
         cluster.getConfig(configBuilder);
         CuratorConfig config = configBuilder.build();
         assertEquals(List.of("host-c1", "host-c2"),
-                config.server().stream().map(CuratorConfig.Server::hostname).collect(Collectors.toList()));
+                config.server().stream().map(CuratorConfig.Server::hostname).toList());
         assertTrue(config.zookeeperLocalhostAffinity());
         assertEquals(30, config.zookeeperSessionTimeoutSeconds());
     }
@@ -360,7 +360,7 @@ public class ContainerClusterTest {
         cluster.getConfig(configBuilder);
         assertEquals(0, configBuilder.build().myid());
         assertEquals(List.of("host-c1", "host-c2", "host-c3"),
-                configBuilder.build().server().stream().map(ZookeeperServerConfig.Server::hostname).collect(Collectors.toList()));
+                configBuilder.build().server().stream().map(ZookeeperServerConfig.Server::hostname).toList());
 
     }
 
@@ -440,11 +440,11 @@ public class ContainerClusterTest {
         cluster.doPrepare(state);
         List<ApplicationClusterEndpoint> endpoints = cluster.endpoints();
 
-        assertNames(List.of(), endpoints.stream().filter(e -> e.routingMethod() == shared).collect(Collectors.toList()));
-        assertNames(expectedSharedL4Names, endpoints.stream().filter(e -> e.routingMethod() == sharedLayer4).collect(Collectors.toList()));
+        assertNames(List.of(), endpoints.stream().filter(e -> e.routingMethod() == shared).toList());
+        assertNames(expectedSharedL4Names, endpoints.stream().filter(e -> e.routingMethod() == sharedLayer4).toList());
 
         List<ContainerEndpoint> endpointsWithWeight =
-                globalEndpoints.stream().filter(endpoint -> endpoint.weight().isPresent()).collect(Collectors.toList());
+                globalEndpoints.stream().filter(endpoint -> endpoint.weight().isPresent()).toList();
         endpointsWithWeight.stream()
                 .filter(ce -> ce.weight().isPresent())
                 .forEach(ce -> assertTrue(endpointsMatch(ce, endpoints)));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
index 1d534c314ba..5f9ebe85e11 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
@@ -136,7 +136,7 @@ public class ConfigserverClusterTest {
     @SuppressWarnings("varargs")
     private static <T> void assertZookeeperServerProperty(
             List<ZookeeperServerConfig.Server> zkServers, Function<ZookeeperServerConfig.Server, T> propertyMapper, T... expectedProperties) {
-        List<T> actualPropertyValues = zkServers.stream().map(propertyMapper).collect(Collectors.toList());
+        List<T> actualPropertyValues = zkServers.stream().map(propertyMapper).toList();
         List<T> expectedPropertyValues = Arrays.asList(expectedProperties);
         assertEquals(expectedPropertyValues, actualPropertyValues);
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
index 0db52bf8eb5..593fa7e76ba 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
@@ -450,7 +450,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         assertEquals(2, caCerts.size());
         List<String> certnames = caCerts.stream()
                 .map(cert -> cert.getSubjectX500Principal().getName())
-                .collect(Collectors.toList());
+                .toList();
         assertThat(certnames, containsInAnyOrder("CN=operator", "CN=application"));
     }
 
@@ -491,7 +491,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
         assertEquals(2, connectorFactories.size());
         List<Integer> ports = connectorFactories.stream()
                 .map(ConnectorFactory::getListenPort)
-                .collect(Collectors.toList());
+                .toList();
         assertThat(ports, Matchers.containsInAnyOrder(8080, 4443));
 
         ConnectorFactory tlsPort = connectorFactories.stream().filter(connectorFactory -> connectorFactory.getListenPort() == 4443).findFirst().orElseThrow();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 6ef7b9f5b56..addf4dffde2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -454,7 +454,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
         final var model = new VespaModel(new NullConfigModelRegistry(), deployState);
         final var containers = model.getContainerClusters().values().stream()
                 .flatMap(cluster -> cluster.getContainers().stream())
-                .collect(Collectors.toList());
+                .toList();
 
         assertFalse(containers.isEmpty(), "Missing container objects based on configuration");
 
@@ -497,7 +497,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
         assertEquals(List.of(cloudAccount), model.provisioned().all().values()
                                                  .stream()
                                                  .map(capacity -> capacity.cloudAccount().get())
-                                                 .collect(Collectors.toList()));
+                                                 .toList());
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
index 3515bb7409e..45546e57808 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
@@ -135,22 +135,28 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase {
         // Valid options, should not log anything
         verifyLoggingOfJvmGcOptions(true, "-XX:+ParallelGCThreads=8");
         verifyLoggingOfJvmGcOptions(true, "-XX:MaxTenuringThreshold=15"); // No + or - after colon
-        verifyLoggingOfJvmGcOptions(false, "-XX:+UseConcMarkSweepGC");
     }
 
-    @Test
-    void requireThatInvalidJvmGcOptionsFailDeployment() throws IOException, SAXException {
+    private void verifyThatInvalidJvmGcOptionsFailDeployment(String options, String expected) throws IOException, SAXException {
         try {
             buildModelWithJvmOptions(new TestProperties().setHostedVespa(true),
-                    new TestLogger(),
-                    "gc-options",
-                    "-XX:+ParallelGCThreads=8 foo     bar");
+                    new TestLogger(), "gc-options", options);
             fail();
         } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().startsWith("Invalid or misplaced JVM GC options in services.xml: bar,foo"));
+            assertTrue(e.getMessage().startsWith(expected));
         }
     }
 
+    @Test
+    void requireThatInvalidJvmGcOptionsFailDeployment() throws IOException, SAXException {
+        verifyThatInvalidJvmGcOptionsFailDeployment(
+                "-XX:+ParallelGCThreads=8 foo     bar",
+                "Invalid or misplaced JVM GC options in services.xml: bar,foo");
+        verifyThatInvalidJvmGcOptionsFailDeployment(
+                "-XX:+UseConcMarkSweepGC",
+                "Invalid or misplaced JVM GC options in services.xml: -XX:+UseConcMarkSweepGC");
+    }
+
     private void verifyLoggingOfJvmGcOptions(boolean isHosted, String override, String... invalidOptions) throws IOException, SAXException  {
         verifyLoggingOfJvmOptions(isHosted, "gc-options", override, invalidOptions);
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java
index cad888168fe..b5cca3f4e7b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java
@@ -43,7 +43,7 @@ public class TopologicalDocumentTypeSorterTest {
 
     private void assertOrder(List<String> expOrder, DocumentTypesBuilder builder) {
         List<NewDocumentType> sortedDocTypes = TopologicalDocumentTypeSorter.sort(builder.build());
-        List<String> actOrder = sortedDocTypes.stream().map(NewDocumentType::getName).collect(Collectors.toList());
+        List<String> actOrder = sortedDocTypes.stream().map(NewDocumentType::getName).toList();
         assertEquals(expOrder, actOrder);
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java
index 12d14448511..fee16620e02 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/SchemaBuilder.java
@@ -42,7 +42,7 @@ public class SchemaBuilder {
         return Arrays.asList(docTypes)
                 .stream()
                 .map(type -> new SchemaBuilder().name(type).build())
-                .collect(Collectors.toList());
+                .toList();
     }
 
 }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
index 11ddf23772f..c06db3199ec 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
@@ -62,7 +62,7 @@ public class NodeFlavors {
     }
 
     private static Collection<Flavor> toFlavors(FlavorsConfig config) {
-        return config.flavor().stream().map(Flavor::new).collect(Collectors.toList());
+        return config.flavor().stream().map(Flavor::new).toList();
     }
 
     @Override
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
index aa295c47af0..ff626201343 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
@@ -51,7 +51,7 @@ public interface ZoneList extends ZoneFilter {
 
     /** Returns the ZoneIds of all zones in this list. */
     default List<ZoneId> ids() {
-        return zones().stream().map(ZoneApi::getVirtualId).collect(Collectors.toList());
+        return zones().stream().map(ZoneApi::getVirtualId).toList();
     }
 
 }
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java
index d748ebb46e5..5a5d65a4de6 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java
@@ -87,7 +87,7 @@ class FileDistributionRpcServer {
         String[] fileRefArray = new String[downloadStatus.keySet().size()];
         fileRefArray = downloadStatus.keySet().stream()
                 .map(FileReference::value)
-                .collect(Collectors.toList())
+                .toList()
                 .toArray(fileRefArray);
 
         double[] downloadStatusArray = new double[downloadStatus.values().size()];
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index b4a3a95e019..25de283ad3a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -632,7 +632,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
                 .filter(fileReference -> ! fileReferencesInUse.contains(fileReference))
                 .filter(fileReference -> isLastModifiedBefore(new File(fileReferencesPath, fileReference), instant))
                 .sorted(Comparator.comparing(a -> lastModified(new File(fileReferencesPath, a))))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public Set<FileReference> getFileReferences(ApplicationId applicationId) {
@@ -682,7 +682,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     public List<ApplicationId> listApplications() {
         return tenantRepository.getAllTenants().stream()
                 .flatMap(tenant -> tenant.getApplicationRepo().activeApplications().stream())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private boolean isLastModifiedBefore(File fileReference, Instant instant) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java
index ae8dd2a329f..ad50117e327 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationSet.java
@@ -87,7 +87,7 @@ public final class ApplicationSet {
         return applications.values().stream()
                 .flatMap(app -> app.getModel().getHosts().stream()
                         .map(HostInfo::getHostname))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public void updateHostMetrics() {
@@ -109,7 +109,7 @@ public final class ApplicationSet {
                 .filter(application -> application.getId().equals(applicationId))
                 .map(Application::getVespaVersion)
                 .sorted()
-                .collect(Collectors.toList());
+                .toList();
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java
index 14d96eb7748..b2672f7ad85 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java
@@ -59,7 +59,7 @@ public class DefaultClusterReindexingStatusClient implements ClusterReindexingSt
         clusters.forEach((clusterId, clusterNodes) -> {
             var parallelRequests = clusterNodes.stream()
                     .map(this::getReindexingStatus)
-                    .collect(Collectors.toList());
+                    .toList();
             CompletableFuture<Map<String, ClusterReindexing>> combinedRequest = CompletableFutures.firstOf(parallelRequests);
             futureStatusPerCluster.put(clusterId, combinedRequest);
         });
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java
index a1ddad7bfd4..8d68541ea2a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionUtil.java
@@ -37,7 +37,7 @@ public class FileDistributionUtil {
                                .stream()
                                .filter(spec -> !spec.getHostName().equals(HostName.getLocalhost()))
                                .map(spec -> "tcp/" + spec.getHostName() + ":" + spec.getConfigServerPort())
-                               .collect(Collectors.toList());
+                               .toList();
     }
 
     public static boolean fileReferenceExistsOnDisk(File downloadDirectory, FileReference applicationPackageReference) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
index bd831944d77..b19e8813434 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
@@ -261,7 +261,7 @@ public class FileServer {
     private static List<CompressionType> compressionTypesAsList(List<String> compressionTypes) {
         return compressionTypes.stream()
                                .map(CompressionType::valueOf)
-                               .collect(Collectors.toList());
+                               .toList();
     }
 
     private static ConnectionPool createConnectionPool(List<String> configServers, Supervisor supervisor) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java
index df0d879b533..cbd66c0bb67 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v1/RoutingStatusApiHandler.java
@@ -129,7 +129,7 @@ public class RoutingStatusApiHandler extends RestApiRequestHandler<RoutingStatus
         DeploymentRoutingStatus wantedStatus = deploymentRoutingStatusFromSlime(requestBody, clock.instant());
         List<DeploymentRoutingStatus> currentStatuses = upstreamNames.stream()
                                                                      .map(this::deploymentStatus)
-                                                                     .collect(Collectors.toList());
+                                                                     .toList();
         DeploymentRoutingStatus currentStatus = currentStatuses.get(0);
         log.log(Level.INFO, "Changing routing status of " + instance + " from " +
                             currentStatus.status() + " to " + wantedStatus.status());
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java
index ce068f4929e..39904a5b2f2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java
@@ -89,7 +89,7 @@ public abstract class ConfigServerMaintainer extends Maintainer {
         return Arrays.stream(curator.zooKeeperEnsembleConnectionSpec().split(","))
                      .filter(hostAndPort -> !hostAndPort.isEmpty())
                      .map(hostAndPort -> hostAndPort.split(":")[0])
-                     .collect(Collectors.toList());
+                     .toList();
     }
 
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java
index a95b9c4cfc2..19cb31b6575 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java
@@ -86,7 +86,7 @@ public class ClusterDeploymentMetricsRetriever {
                     }
                     return null;
                 })
-                .collect(Collectors.toList());
+                .toList();
         try {
             executor.invokeAll(jobs, 1, TimeUnit.MINUTES);
         } catch (InterruptedException e) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java
index c2a335e3429..1c28538fb90 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetriever.java
@@ -40,7 +40,7 @@ public class DeploymentMetricsRetriever {
                 .filter(host -> host.getServices().stream().noneMatch(isLogserver()))
                 .map(HostInfo::getHostname)
                 .map(DeploymentMetricsRetriever::createMetricsProxyURI)
-                .collect(Collectors.toList());
+                .toList();
 
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java
index 9cf9258d6ce..2e0cd7c0a81 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetriever.java
@@ -32,7 +32,7 @@ public class ProtonMetricsRetriever {
                 .filter(host -> host.getServices().stream().anyMatch(isSearchNode()))
                 .map(HostInfo::getHostname)
                 .map(ProtonMetricsRetriever::createMetricsProxyURI)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static Predicate<ServiceInfo> isSearchNode() {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
index bfe61155c99..e0d333db082 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/LbServicesProducer.java
@@ -74,7 +74,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
                 .sorted(Comparator.comparing(ApplicationClusterInfo::name))
                 .map(ApplicationClusterInfo::endpoints)
                 .flatMap(endpoints -> getEndpointConfig(endpoints).stream())
-                .collect(Collectors.toList());
+                .toList();
         ab.endpoints(endpointBuilder);
         return ab;
     }
@@ -83,7 +83,7 @@ public class LbServicesProducer implements LbServicesConfig.Producer {
         return clusterEndpoints.stream()
                 .sorted(Comparator.comparing(ApplicationClusterEndpoint::dnsName))
                 .map(this::getEndpointConfig)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private LbServicesConfig.Tenants.Applications.Endpoints.Builder getEndpointConfig(ApplicationClusterEndpoint clusterEndpoints) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index d32d1a4e000..2733ff9721e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -109,7 +109,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                                               .map(Version::getMajor)
                                               .distinct()
                                               .sorted(Comparator.reverseOrder())
-                                              .collect(Collectors.toList());
+                                              .toList();
 
         List<MODELRESULT> allApplicationModels = new ArrayList<>();
         // Build latest model for latest major only, if that fails build latest model for previous major
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
index e6ae5c491c0..9714ff495b3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
@@ -186,7 +186,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
             try {
                 hostValidator.verifyHosts(applicationId, model.getHosts().stream()
                                                               .map(HostInfo::getHostname)
-                                                              .collect(Collectors.toList()));
+                                                              .toList());
                 return;
             } catch (IllegalArgumentException e) {
                 exception = e;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java
index 4469c0f95de..f36ddaafd03 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java
@@ -38,7 +38,7 @@ public class StaticProvisioner implements HostProvisioner {
         List<HostSpec> hostsAlreadyAllocatedToCluster = 
                 allocatedHosts.getHosts().stream()
                                          .filter(host -> host.membership().isPresent() && matches(host.membership().get().cluster(), cluster))
-                                         .collect(Collectors.toList());
+                                         .toList();
         if ( ! hostsAlreadyAllocatedToCluster.isEmpty()) 
             return hostsAlreadyAllocatedToCluster;
         else
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
index ec673377af9..a7a22393771 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
@@ -395,7 +395,7 @@ public final class PrepareParams {
         return SlimeUtils.entriesStream(array)
                 .map(Inspector::asString)
                 .map(X509CertificateUtils::fromPem)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public String getApplicationName() {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 4928af488e1..7041840de12 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -460,7 +460,7 @@ public class SessionPreparer {
          public ConfigChangeActions getConfigChangeActions() {
             return new ConfigChangeActions(results.stream().map(result -> result.actions)
                                                            .flatMap(Collection::stream)
-                                                           .collect(Collectors.toList()));
+                                                           .toList());
          }
 
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 9c50636ecfb..bcb9882f008 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -408,11 +408,11 @@ public class SessionRepository {
     private List<Long> getSessionListFromDirectoryCache(List<ChildData> children) {
         return getSessionList(children.stream()
                                       .map(child -> Path.fromString(child.getPath()).getName())
-                                      .collect(Collectors.toList()));
+                                      .toList());
     }
 
     private List<Long> getSessionList(List<String> children) {
-        return children.stream().map(Long::parseLong).collect(Collectors.toList());
+        return children.stream().map(Long::parseLong).toList();
     }
 
     private void loadRemoteSessions(ExecutorService executor) throws NumberFormatException {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/OperatorCertificateSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/OperatorCertificateSerializer.java
index 23d90b68ee4..232dd2e5fe7 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/OperatorCertificateSerializer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/OperatorCertificateSerializer.java
@@ -32,6 +32,6 @@ public class OperatorCertificateSerializer {
         return SlimeUtils.entriesStream(object.field(certificateField))
                 .map(Inspector::asString)
                 .map(X509CertificateUtils::fromPem)
-                .collect(Collectors.toList());
+                .toList();
     }
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java
index e775d8d0124..89395b66a39 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/SecretStoreExternalIdRetriever.java
@@ -24,7 +24,7 @@ public class SecretStoreExternalIdRetriever {
                      throw new RuntimeException("No secret found in secret store for " + secretName);
                     return tenantSecretStore.withExternalId(secret);
                 })
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public static String secretName(TenantName tenant, SystemName system, String storeName) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 74ec5e81da3..2e60a6c6cd0 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -295,10 +295,8 @@ public class ApplicationRepositoryTest {
         // deployApp(new File("src/test/apps/app"), prepareParams);
 
         List<String> deleted = applicationRepository.deleteUnusedFileDistributionReferences(fileDirectory, keepFileReferencesDuration);
-        Collections.sort(deleted);
-        List<String> expected = new ArrayList<>(List.of("bar", "baz0", "baz1"));
-        Collections.sort(expected);
-        assertEquals(expected, deleted);
+        List<String> expected = List.of("bar", "baz0", "baz1");
+        assertEquals(expected.stream().sorted().toList(), deleted.stream().sorted().toList());
         // bar, baz0 and baz1 will be deleted and foo is not old enough to be considered
         assertFalse(filereferenceDirOldest.exists());
         assertFalse(new File(fileReferencesDir, "baz0").exists());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
index dad029e909a..2f595d4ed06 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
@@ -75,7 +75,7 @@ public class ConfigServerBootstrapTest {
         assertEquals(List.of("ApplicationPackageMaintainer", "TenantsMaintainer"),
                      bootstrap.configServerMaintenance().maintainers().stream()
                               .map(Maintainer::name)
-                              .sorted().collect(Collectors.toList()));
+                              .sorted().toList());
         assertFalse(bootstrap.vipStatus().isInRotation());
 
         bootstrap.doStart();
@@ -86,7 +86,7 @@ public class ConfigServerBootstrapTest {
         assertEquals(List.of("ApplicationPackageMaintainer", "FileDistributionMaintainer", "ReindexingMaintainer", "SessionsMaintainer", "TenantsMaintainer"),
                      bootstrap.configServerMaintenance().maintainers().stream()
                               .map(Maintainer::name)
-                              .sorted().collect(Collectors.toList()));
+                              .sorted().toList());
 
         bootstrap.deconstruct();
         assertEquals(StateMonitor.Status.down, bootstrap.status());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
index 97e184bdcfa..df52ab624c6 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
@@ -38,7 +38,7 @@ public class ClusterDeploymentMetricsRetrieverTest {
     public void testMetricAggregation() throws IOException {
         List<URI> hosts = Stream.of(1, 2, 3, 4)
                 .map(item -> URI.create("http://localhost:" + wireMock.port() + "/" + item))
-                .collect(Collectors.toList());
+                .toList();
 
         stubFor(get(urlEqualTo("/1"))
                 .willReturn(aResponse()
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java
index 7af02370e7e..585ce3980fc 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java
@@ -30,7 +30,7 @@ public class ClusterProtonMetricsRetrieverTest {
     public void testMetricAggregation() throws IOException {
         List<URI> hosts = Stream.of(1, 2)
                 .map(item -> URI.create("http://localhost:" + wireMock.port() + "/metrics" + item + "/v2/values"))
-                .collect(Collectors.toList());
+                .toList();
 
         stubFor(get(urlEqualTo("/metrics1/v2/values"))
                 .willReturn(aResponse()
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
index 8167cd8a2ee..4f52eede4e8 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
@@ -127,24 +127,24 @@ public class LbServicesProducerTest {
         List<Endpoints> endpointList = config.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").endpoints();
         // Expect 2 zone endpoints (2 suffixes), 2 global endpoints and 1 application endpoint
         assertEquals(5, endpointList.size());
-        List<Endpoints> zoneEndpoints = endpointList.stream().filter(e -> e.scope() == zone).collect(Collectors.toList());
+        List<Endpoints> zoneEndpoints = endpointList.stream().filter(e -> e.scope() == zone).toList();
         assertEquals(2, zoneEndpoints.size());
         assertTrue(zoneEndpoints.stream()
                            .filter(e -> e.routingMethod() == sharedLayer4)
-                           .map(Endpoints::dnsName).collect(Collectors.toList())
+                           .map(Endpoints::dnsName).toList()
                 .containsAll(List.of("mydisc.foo.foo.endpoint1.suffix", "mydisc.foo.foo.endpoint2.suffix")));
         assertContainsEndpoint(zoneEndpoints, "mydisc.foo.foo.endpoint1.suffix", "mydisc", zone, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
         assertContainsEndpoint(zoneEndpoints, "mydisc.foo.foo.endpoint2.suffix", "mydisc", zone, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
 
-        List<Endpoints> globalEndpoints = endpointList.stream().filter(e -> e.scope() == global).collect(Collectors.toList());
+        List<Endpoints> globalEndpoints = endpointList.stream().filter(e -> e.scope() == global).toList();
         assertEquals(2, globalEndpoints.size());
-        assertTrue(globalEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()).containsAll(List.of("rotation-1", "rotation-2")));
+        assertTrue(globalEndpoints.stream().map(Endpoints::dnsName).toList().containsAll(List.of("rotation-1", "rotation-2")));
         assertContainsEndpoint(globalEndpoints, "rotation-1", "mydisc", global, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
         assertContainsEndpoint(globalEndpoints, "rotation-2", "mydisc", global, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
 
-        List<Endpoints> applicationEndpoints = endpointList.stream().filter(e -> e.scope() == application).collect(Collectors.toList());
+        List<Endpoints> applicationEndpoints = endpointList.stream().filter(e -> e.scope() == application).toList();
         assertEquals(1, applicationEndpoints.size());
-        assertTrue(applicationEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()).contains("app-endpoint"));
+        assertTrue(applicationEndpoints.stream().map(Endpoints::dnsName).toList().contains("app-endpoint"));
         assertContainsEndpoint(applicationEndpoints, "app-endpoint", "mydisc", application, sharedLayer4, 1, List.of("foo.foo.yahoo.com"));
     }
 
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
index e5a66fea8d1..e2748c592b8 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
@@ -112,7 +112,7 @@ public class ComponentNode extends Node {
         if (Provider.class.isAssignableFrom(clazz)) {
             //TODO: Test what happens if you ask for something that isn't a class, e.g. a parameterized type.
 
-            List<Type> allGenericInterfaces = allSuperClasses(clazz).stream().flatMap(c -> Arrays.stream(c.getGenericInterfaces())).collect(Collectors.toList());
+            List<Type> allGenericInterfaces = allSuperClasses(clazz).stream().flatMap(c -> Arrays.stream(c.getGenericInterfaces())).toList();
             for (Type t : allGenericInterfaces) {
                 if (t instanceof ParameterizedType && ((ParameterizedType) t).getRawType().equals(Provider.class)) {
                     Type[] typeArgs = ((ParameterizedType) t).getActualTypeArguments();
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
index 244327ab4ec..ae06275fd2b 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
@@ -96,8 +96,8 @@ public class ComponentRegistryNode extends Node {
 
     public static boolean equalNodeEdges(List<Node> edges, List<Node> otherEdges) {
         if (edges.size() == otherEdges.size()) {
-            List<ComponentId> left = edges.stream().map(Node::componentId).sorted().collect(Collectors.toList());
-            List<ComponentId> right = otherEdges.stream().map(Node::componentId).sorted().collect(Collectors.toList());
+            List<ComponentId> left = edges.stream().map(Node::componentId).sorted().toList();
+            List<ComponentId> right = otherEdges.stream().map(Node::componentId).sorted().toList();
             return left.equals(right);
         } else {
             return false;
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
index d8c9f0ce98c..353613a8a4f 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
@@ -89,7 +89,7 @@ public class CycleFinder<T> {
         T cycleStart = pathWithCycle.get(pathWithCycle.size() - 1);
         return pathWithCycle.stream()
                 .dropWhile(vertex -> ! vertex.equals(cycleStart))
-                .collect(Collectors.toList());
+                .toList();
     }
 
 }
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
index 2e2eb257b6a..53d8698c417 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyConnectionLogger.java
@@ -310,7 +310,7 @@ class JettyConnectionLogger extends AbstractLifeCycle implements Connection.List
                 this.sslPeerNotAfter = peerCertificate.getNotAfter();
                 this.sslSubjectAlternativeNames = X509CertificateUtils.getSubjectAlternativeNames(peerCertificate).stream()
                         .map(SubjectAlternativeName::getValue)
-                        .collect(Collectors.toList());
+                        .toList();
                 this.sslPeerIssuerSubject = peerCertificate.getIssuerX500Principal().getName();
                 this.sslPeerEncodedCertificate = peerCertificate.getEncoded();
             } catch (SSLPeerUnverifiedException | CertificateEncodingException e) {
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java b/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
index bd13c04e8b5..bc57a50b3fc 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
@@ -234,7 +234,7 @@ public class SearchPath {
                 return Collections.emptyList();
             }
             int end = Math.min(to, max);
-            return IntStream.range(from, end).boxed().collect(Collectors.toList());
+            return IntStream.range(from, end).boxed().toList();
         }
 
         @Override
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
index 906268c5904..3e6e092ea70 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchGroupsImpl.java
@@ -38,7 +38,7 @@ public class SearchGroupsImpl implements SearchGroups {
 
     public long medianDocumentsPerGroup() {
         if (isEmpty()) return 0;
-        var activeDocuments = groups().stream().map(Group::activeDocuments).collect(Collectors.toList());
+        var activeDocuments = groups().stream().map(Group::activeDocuments).toList();
         return (long) Quantiles.median().compute(activeDocuments);
     }
 }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java b/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
index 89c45fde6ae..d85a4c25413 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
@@ -32,7 +32,8 @@ class FederationResult {
         this.targetResults = targetResults;
 
         if (targetResults.stream().anyMatch(TargetResult::isMandatory))
-            targetsToWaitFor = targetResults.stream().filter(TargetResult::isMandatory).collect(Collectors.toList());
+            targetsToWaitFor = targetResults.stream().filter(TargetResult::isMandatory)
+                    .collect(Collectors.toCollection(ArrayList::new));
         else
             targetsToWaitFor = new ArrayList<>(targetResults);
     }
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java
index 418251cdd56..2a14607011c 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AddFunction.java
@@ -32,7 +32,7 @@ public class AddFunction extends FunctionNode {
     public AddFunction copy() {
         return new AddFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
index d01c7fe70f4..0ac09a39516 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
@@ -32,7 +32,7 @@ public class AndFunction extends FunctionNode {
     public AndFunction copy() {
         return new AndFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java
index 7095e411dd6..fdb502b47f4 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AvgFunction.java
@@ -32,7 +32,7 @@ public class AvgFunction extends FunctionNode {
     public AvgFunction copy() {
         return new AvgFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java
index e0f08e81e15..32c86a29d48 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/CatFunction.java
@@ -32,7 +32,7 @@ public class CatFunction extends FunctionNode {
     public CatFunction copy() {
         return new CatFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java
index 72916b3f9c3..94608e8fad5 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DivFunction.java
@@ -33,7 +33,7 @@ public class DivFunction extends FunctionNode {
     public DivFunction copy() {
         return new DivFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java
index fd91f0a2d57..9f3c68c9c85 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DoublePredefined.java
@@ -35,7 +35,7 @@ public class DoublePredefined extends PredefinedFunction {
                                     args().stream().skip(1)
                                                    .map(DoubleBucket.class::cast)
                                                    .map(arg -> arg.copy())
-                                                   .collect(Collectors.toList()));
+                                                   .toList());
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java
index 4f4bca2b3af..e62688612a8 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/LongPredefined.java
@@ -37,7 +37,7 @@ public class LongPredefined extends PredefinedFunction {
                                         .skip(1)
                                         .map(LongBucket.class::cast)
                                         .map(arg -> arg.copy())
-                                        .collect(Collectors.toList()));
+                                        .toList());
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java
index 1ff55366365..fcf6b417ba5 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MaxFunction.java
@@ -31,7 +31,7 @@ public class MaxFunction extends FunctionNode {
     public MaxFunction copy() {
         return new MaxFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java
index 5b287affa1e..cf61b29a026 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MinFunction.java
@@ -31,7 +31,7 @@ public class MinFunction extends FunctionNode {
     public MinFunction copy() {
         return new MinFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java
index 7de1b047589..2c422fd6222 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/ModFunction.java
@@ -32,7 +32,7 @@ public class ModFunction extends FunctionNode {
     public ModFunction copy() {
         return new ModFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
index f0142bbb666..f53c3a945aa 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/MulFunction.java
@@ -31,7 +31,7 @@ public class MulFunction extends FunctionNode {
     public MulFunction copy() {
         return new MulFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java
index 731f0b3b23b..e6cb81b43c3 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/OrFunction.java
@@ -32,7 +32,7 @@ public class OrFunction extends FunctionNode {
     public OrFunction copy() {
         return new OrFunction(getLabel(),
                               getLevelOrNull(),
-                              args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                              args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/RawPredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/RawPredefined.java
index ff9cc2f681a..205a04e1a30 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/RawPredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/RawPredefined.java
@@ -36,7 +36,7 @@ public class RawPredefined extends PredefinedFunction {
                                        .skip(1)
                                        .map(RawBucket.class::cast)
                                        .map(arg -> arg.copy())
-                                       .collect(Collectors.toList()));
+                                       .toList());
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java
index 31f378b009c..c651a344de5 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StrCatFunction.java
@@ -32,7 +32,7 @@ public class StrCatFunction extends FunctionNode {
     public StrCatFunction copy() {
         return new StrCatFunction(getLabel(),
                                   getLevelOrNull(),
-                                  args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                                  args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java
index 2b333bfb216..38d190f9b53 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StringPredefined.java
@@ -36,7 +36,7 @@ public class StringPredefined extends PredefinedFunction {
                                           .skip(1)
                                           .map(StringBucket.class::cast)
                                           .map(arg -> arg.copy())
-                                          .collect(Collectors.toList()));
+                                          .toList());
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java
index a2e6c04c4b0..2477e75567f 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/SubFunction.java
@@ -32,7 +32,7 @@ public class SubFunction extends FunctionNode {
     public SubFunction copy() {
         return new SubFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java
index 3917c2b7389..2fdcf8168fd 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/UcaFunction.java
@@ -49,7 +49,7 @@ public class UcaFunction extends FunctionNode {
     public UcaFunction copy() {
         return new UcaFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     private boolean validStrength(String strength) {
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
index d408b6c3a37..437c0daa8ac 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/XorBitFunction.java
@@ -32,7 +32,7 @@ public class XorBitFunction extends FunctionNode {
     public XorBitFunction copy() {
         return new XorBitFunction(getLabel(),
                                   getLevelOrNull(),
-                                  args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                                  args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java
index 30d74ce2f0e..715bbe26600 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/XorFunction.java
@@ -32,7 +32,7 @@ public class XorFunction extends FunctionNode {
     public XorFunction copy() {
         return new XorFunction(getLabel(),
                                getLevelOrNull(),
-                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
+                               args().stream().map(arg -> arg.copy()).toList());
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
index 9699e9a7448..09a399ed5bb 100644
--- a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
+++ b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
@@ -477,7 +477,7 @@ public class HitGroup extends Hit implements DataList<Hit>, Cloneable, Iterable<
         if (getQuery().errors().isEmpty()) return null;
 
         // Move errors from the query into this
-        List<ErrorMessage> queryErrors = getQuery().errors().stream().map(this::toSearchError).collect(Collectors.toList());
+        List<ErrorMessage> queryErrors = getQuery().errors().stream().map(this::toSearchError).toList();
         getQuery().errors().clear(); // TODO: Remove this line (not promised, can be done at any time)
         return new DefaultErrorHit(getSource(), queryErrors);
     }
diff --git a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java
index 7bd66445512..3d56dd99e30 100644
--- a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java
+++ b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java
@@ -122,7 +122,7 @@ public class SchemaInfo {
         }
 
         private static List<Schema> keep(Set<String> names, Collection<Schema> schemas) {
-            return schemas.stream().filter(schema -> names.contains(schema.name())).collect(Collectors.toList());
+            return schemas.stream().filter(schema -> names.contains(schema.name())).toList();
         }
 
         /**
diff --git a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java
index ed1d25a0b35..6947a93a833 100644
--- a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java
+++ b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfoConfigurer.java
@@ -19,7 +19,7 @@ import java.util.stream.Collectors;
 class SchemaInfoConfigurer {
 
     static List<Schema> toSchemas(SchemaInfoConfig schemaInfoConfig) {
-        return schemaInfoConfig.schema().stream().map(config -> toSchema(config)).collect(Collectors.toList());
+        return schemaInfoConfig.schema().stream().map(config -> toSchema(config)).toList();
     }
 
     static Schema toSchema(SchemaInfoConfig.Schema schemaInfoConfig) {
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index bd9bffea118..9a75d994919 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -145,8 +145,8 @@ public class QueryTestCase {
     @Test
     void testCloneWithConnectivity() {
         List<String> l = List.of("a", "b", "c", "a");
-        printIt(l.stream().filter(i -> isA(i)).collect(Collectors.toList()));
-        printIt(l.stream().filter(i -> !isA(i)).collect(Collectors.toList()));
+        printIt(l.stream().filter(i -> isA(i)).toList());
+        printIt(l.stream().filter(i -> !isA(i)).toList());
 
         Query q = new Query();
         WordItem a = new WordItem("a");
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java
index f761734aa13..16d8b72ff52 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/AthenzAccessControlService.java
@@ -60,7 +60,7 @@ public class AthenzAccessControlService implements AccessControlService {
         return zmsClient.listMembers(dataPlaneAccessRole)
                 .stream().filter(AthenzUser.class::isInstance)
                 .map(AthenzUser.class::cast)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /**
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
index 28bb9182c6a..91ca763abb6 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
@@ -199,7 +199,7 @@ public class ZmsClientMock implements ZmsClient {
                         AthenzResourceName.fromString(a.resource()),
                         a.action())
                         .build())
-                .collect(Collectors.toList());
+                .toList();
         return Optional.of(new AthenzPolicy(policy.name(), assertions));
     }
 
@@ -221,7 +221,7 @@ public class ZmsClientMock implements ZmsClient {
     public List<AthenzService> listServices(AthenzDomain athenzDomain) {
         return athenz.getOrCreateDomain(athenzDomain).services.keySet().stream()
                 .map(serviceName -> new AthenzService(athenzDomain, serviceName))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java
index 2ac3242f6aa..3cee9e1ca2c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java
@@ -159,7 +159,7 @@ public class BillingDatabaseClientMock implements BillingDatabaseClient {
                     var end = endTimes.get(invoiceId);
                     return new Bill(invoiceId, tenant, status, items, start, end);
                 })
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -173,7 +173,7 @@ public class BillingDatabaseClientMock implements BillingDatabaseClient {
                     var end = endTimes.get(invoiceId);
                     return new Bill(invoiceId, tenant, status, items, start, end);
                 })
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
index 44dd3a293c5..c9f9b7f50e4 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
@@ -42,7 +42,7 @@ public class MockBillingController implements BillingController {
     public List<TenantName> tenantsWithPlan(List<TenantName> tenants, PlanId planId) {
         return tenants.stream()
                 .filter(t -> plans.getOrDefault(t, PlanId.from("trial")).equals(planId))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -156,7 +156,7 @@ public class MockBillingController implements BillingController {
 
     @Override
     public List<Bill> getBills() {
-        return committedBills.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+        return committedBills.values().stream().flatMap(Collection::stream).toList();
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java
index 3bc3d3ee9e8..f7e7d69cd2f 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java
@@ -86,7 +86,7 @@ public class EndpointCertificateMock implements EndpointCertificateProvider {
                 "ok",
                 "ticket_id",
                 "athenz_domain",
-                metadata.requestedDnsSans().stream().map(name -> new EndpointCertificateRequestMetadata.DnsNameStatus(name, "done")).collect(Collectors.toList()),
+                metadata.requestedDnsSans().stream().map(name -> new EndpointCertificateRequestMetadata.DnsNameStatus(name, "done")).toList(),
                 "duration_sec",
                 "expiry",
                 metadata.keyName(),
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
index aff58989231..0a71e185717 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
@@ -45,7 +45,7 @@ public class MemoryNameService implements NameService {
         var records = targets.stream()
                              .sorted((a, b) -> Comparator.comparing(AliasTarget::name).compare(a, b))
                              .map(d -> new Record(Record.Type.ALIAS, name, d.pack()))
-                             .collect(Collectors.toList());
+                             .toList();
         // Satisfy idempotency contract of interface
         for (var r1 : records) {
             this.records.removeIf(r2 -> conflicts(r1, r2));
@@ -59,7 +59,7 @@ public class MemoryNameService implements NameService {
         var records = targets.stream()
                 .sorted((a, b) -> Comparator.comparing((DirectTarget target) -> target.recordData().asString()).compare(a, b))
                 .map(d -> new Record(Record.Type.DIRECT, name, d.pack()))
-                .collect(Collectors.toList());
+                .toList();
         // Satisfy idempotency contract of interface
         for (var r1 : records) {
             this.records.removeIf(r2 -> conflicts(r1, r2));
@@ -72,7 +72,7 @@ public class MemoryNameService implements NameService {
     public List<Record> createTxtRecords(RecordName name, List<RecordData> txtData) {
         var records = txtData.stream()
                              .map(data -> new Record(Record.Type.TXT, name, data))
-                             .collect(Collectors.toList());
+                             .toList();
         records.forEach(this::add);
         return records;
     }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ApplicationData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ApplicationData.java
index b6f99d611f8..fe3a2993f17 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ApplicationData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ApplicationData.java
@@ -24,7 +24,7 @@ public class ApplicationData {
 
     public Application toApplication() {
         return new Application(ApplicationId.fromFullString(id),
-                               clusters.entrySet().stream().map(e -> e.getValue().toCluster(e.getKey())).collect(Collectors.toList()));
+                               clusters.entrySet().stream().map(e -> e.getValue().toCluster(e.getKey())).toList());
     }
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
index ffc74f002d5..9c2104232f1 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ClusterData.java
@@ -56,7 +56,7 @@ public class ClusterData {
                            suggested == null ? Optional.empty() : Optional.of(suggested.toClusterResources()),
                            utilization == null ? Cluster.Utilization.empty() : utilization.toClusterUtilization(),
                            scalingEvents == null ? List.of()
-                                                 : scalingEvents.stream().map(data -> data.toScalingEvent()).collect(Collectors.toList()),
+                                                 : scalingEvents.stream().map(data -> data.toScalingEvent()).toList(),
                            autoscalingStatusCode,
                            autoscalingStatus,
                            scalingDuration == null ? Duration.ofMillis(0) : Duration.ofMillis(scalingDuration),
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java
index 75ac919f776..3d29d12b87f 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepoStatsData.java
@@ -34,7 +34,7 @@ public class NodeRepoStatsData {
     public NodeRepoStats toNodeRepoStats() {
         return new NodeRepoStats(totalCost, totalAllocatedCost,
                                  load.toLoad(), activeLoad.toLoad(),
-                                 applications.stream().map(stats -> stats.toApplicationStats()).collect(Collectors.toList()));
+                                 applications.stream().map(stats -> stats.toApplicationStats()).toList());
     }
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockIssueHandler.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockIssueHandler.java
index b0fed17bdea..d60c4d196e2 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockIssueHandler.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/MockIssueHandler.java
@@ -56,7 +56,7 @@ public class MockIssueHandler implements IssueHandler {
                                                  entry.getValue().updated,
                                                  entry.getValue().isOpen() ? Status.toDo : Status.done,
                                                  entry.getValue().assignee))
-                     .collect(Collectors.toList());
+                     .toList();
     }
 
     @Override
@@ -146,8 +146,8 @@ public class MockIssueHandler implements IssueHandler {
                         userList.stream().map(user ->
                                 user.split(" ")[0])
                                 .map(User::from)
-                                .collect(Collectors.toList())
-                ).collect(Collectors.toList());
+                                .toList()
+                ).toList();
     }
 
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java
index f3abfd37b38..542bdd52477 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java
@@ -84,7 +84,7 @@ public class ResourceDatabaseClientMock implements ResourceDatabaseClient {
                             BigDecimal.valueOf(a.getDiskGb()).multiply(d)
                     );
                 })
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private ResourceUsage resourceUsageAdd(ResourceUsage a, ResourceUsage b) {
@@ -119,7 +119,7 @@ public class ResourceDatabaseClientMock implements ResourceDatabaseClient {
                 .map(usages -> usages.stream().reduce(this::resourceUsageAdd))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java
index e53be91f94b..939c74fe61d 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockTesterCloud.java
@@ -42,7 +42,7 @@ public class MockTesterCloud implements TesterCloud {
 
     @Override
     public List<LogEntry> getLog(DeploymentId deploymentId, long after) {
-        return log.stream().filter(entry -> entry.id() > after).collect(Collectors.toList());
+        return log.stream().filter(entry -> entry.id() > after).toList();
     }
 
     @Override
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Enforcer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Enforcer.java
index 84217e4107f..571f38d34a5 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Enforcer.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Enforcer.java
@@ -27,7 +27,7 @@ public class Enforcer {
     public boolean allows(Role role, Action action, URI resource) {
         List<Policy> matchingPolicies = role.definition().policies().stream()
                 .filter(policy -> policy.evaluate(action, resource, role.context, system))
-                .collect(Collectors.toList());
+                .toList();
         logger.log(Level.FINE, "Matching policies for " +
                                "role: " + role.definition().name() + ", "+
                                "action " + action.name() + ", " +
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java
index 7e0fc50660e..3d0ee65961f 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantContacts.java
@@ -40,7 +40,7 @@ public class TenantContacts {
         return contacts.stream()
                 .filter(type::isInstance)
                 .map(type::cast)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public boolean isEmpty() {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index e4feaccca89..602a53035a6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -548,7 +548,7 @@ public class ApplicationController {
                                                                  .map(LogEntry::message)
                                                                  .sorted()
                                                                  .distinct()
-                                                                 .collect(Collectors.toList()))
+                                                                 .toList())
                                                 .orElseGet(List::of);
                 if (warnings.isEmpty())
                     controller.notificationsDb().removeNotification(source, Notification.Type.applicationPackage);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
index 84aa26b93f3..4ccebfa11e0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
@@ -143,7 +143,7 @@ public class RoutingController {
                 List<DeploymentId> deployments = spec.zones().stream()
                                                      .filter(zone -> zone.concerns(Environment.prod))
                                                      .map(zone -> new DeploymentId(instance, ZoneId.from(Environment.prod, zone.region().get())))
-                                                     .collect(Collectors.toList());
+                                                     .toList();
                 RoutingId routingId = RoutingId.of(instance, EndpointId.defaultId());
                 endpoints.addAll(computeGlobalEndpoints(routingId, ClusterSpec.Id.from(clusterId), deployments, deploymentSpec));
             });
@@ -153,7 +153,7 @@ public class RoutingController {
                 List<DeploymentId> deployments = declaredEndpoint.regions().stream()
                                                                  .map(region -> new DeploymentId(instance,
                                                                                                  ZoneId.from(Environment.prod, region)))
-                                                                 .collect(Collectors.toList());
+                                                                 .toList();
                 endpoints.addAll(computeGlobalEndpoints(routingId, ClusterSpec.Id.from(declaredEndpoint.containerId()), deployments, deploymentSpec));
             });
         }
@@ -345,7 +345,7 @@ public class RoutingController {
         for (var rotation : instance.rotations()) {
             var deployments = rotation.regions().stream()
                                       .map(region -> new DeploymentId(instance.id(), ZoneId.from(Environment.prod, region)))
-                                      .collect(Collectors.toList());
+                                      .toList();
             endpointsToRemove.addAll(computeGlobalEndpoints(RoutingId.of(instance.id(), rotation.endpointId()),
                                                             rotation.clusterId(), deployments, application.deploymentSpec()));
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
index 563c59630d1..4547e3e2c23 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
@@ -70,7 +70,7 @@ public class TenantController {
         return curator.readTenants().stream()
                 .filter(tenant -> tenant.type() != Tenant.Type.deleted || includeDeleted)
                 .sorted(Comparator.comparing(Tenant::name))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /** Locks a tenant for modification and applies the given action. */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java
index e18f6247cb1..4e4babfea5e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java
@@ -42,7 +42,7 @@ public class ApplicationPackageDiff {
                 .flatMap(contents -> contents.keySet().stream())
                 .sorted()
                 .distinct()
-                .collect(Collectors.toList());
+                .toList();
         for (String file : files) {
             if (sb.length() > maxTotalDiffSize)
                 sb.append("--- ").append(file).append('\n').append("Diff skipped: Total diff size >").append(maxTotalDiffSize).append("B)\n\n");
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
index 977dd30c900..aeac28782a6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
@@ -242,7 +242,7 @@ public class ApplicationPackageValidator {
                                   .flatMap(zone -> zone.region().stream())
                                   .distinct()
                                   .map(region -> new Endpoint.Target(region, instance.name(), 1))
-                                  .collect(Collectors.toList());
+                                  .toList();
             return new Endpoint(EndpointId.defaultId().id(), globalServiceId, Endpoint.Level.instance, targets);
         });
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
index 4c314c64f7f..8d983714be4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
@@ -243,7 +243,7 @@ public class DeploymentStatus {
                        .filter(version -> version.confidence().equalOrHigherThan(target))
                        .map(VespaVersion::versionNumber)
                        .sorted(reverseOrder())
-                       .collect(Collectors.toList());
+                       .toList();
     }
 
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java
index cb0ff0644fa..e3f61afec89 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/NodeList.java
@@ -32,7 +32,7 @@ public class NodeList extends AbstractFilteringList<NodeWithServices, NodeList>
                                                                    parentsByHostName.get(node.parentHostname().get()),
                                                                    services.wantedGeneration(),
                                                                    servicesByHostName.getOrDefault(node.hostname(), List.of())))
-                                 .collect(Collectors.toList()),
+                                 .toList(),
                             false,
                             services.wantedGeneration());
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java
index e0c1fef91b3..5aaa187055d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RetriggerEntrySerializer.java
@@ -27,7 +27,7 @@ public class RetriggerEntrySerializer {
     public List<RetriggerEntry> fromSlime(Slime slime) {
         return SlimeUtils.entriesStream(slime.get().field("entries"))
                 .map(this::deserializeEntry)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public Slime toSlime(List<RetriggerEntry> entryList) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java
index 88e4f351f1f..220c1a9a6a3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecords.java
@@ -56,7 +56,7 @@ public class CreateRecords implements NameServiceRequest {
                 nameService.createDirect(name, targets);
             }
             case TXT -> {
-                var dataFields = records.stream().map(Record::data).collect(Collectors.toList());
+                var dataFields = records.stream().map(Record::data).toList();
                 nameService.createTxtRecords(name, dataFields);
             }
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
index 57c83280b8b..df0d8877e07 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
@@ -52,7 +52,7 @@ public class NameServiceForwarder {
     public void createAlias(RecordName name, Set<AliasTarget> targets, NameServiceQueue.Priority priority) {
         var records = targets.stream()
                              .map(target -> new Record(Record.Type.ALIAS, name, target.pack()))
-                             .collect(Collectors.toList());
+                             .toList();
         forward(new CreateRecords(records), priority);
     }
 
@@ -60,7 +60,7 @@ public class NameServiceForwarder {
     public void createDirect(RecordName name, Set<DirectTarget> targets, NameServiceQueue.Priority priority) {
         var records = targets.stream()
                              .map(target -> new Record(Record.Type.DIRECT, name, target.pack()))
-                             .collect(Collectors.toList());
+                             .toList();
         forward(new CreateRecords(records), priority);
     }
 
@@ -68,7 +68,7 @@ public class NameServiceForwarder {
     public void createTxt(RecordName name, List<RecordData> txtData, NameServiceQueue.Priority priority) {
         var records = txtData.stream()
                              .map(data -> new Record(Record.Type.TXT, name, data))
-                             .collect(Collectors.toList());
+                             .toList();
         forward(new CreateRecords(records), priority);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
index 439f1aa9a09..25c4121c271 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArtifactExpirer.java
@@ -51,7 +51,7 @@ public class ArtifactExpirer extends ControllerMaintainer {
             Instant now = controller().clock().instant();
             List<Artifact> artifactsToExpire = artifactRegistry.list().stream()
                     .filter(artifact -> isExpired(artifact, now, versionStatus))
-                    .collect(Collectors.toList());
+                    .toList();
             if (!artifactsToExpire.isEmpty()) {
                 log.log(Level.INFO, "Expiring " + artifactsToExpire.size() + " artifacts in " + cloudName + ": " + artifactsToExpire);
                 artifactRegistry.deleteAll(artifactsToExpire);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java
index 128d7e6ac71..fa44b1480e3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java
@@ -51,7 +51,7 @@ public class ChangeManagementAssessor {
         var tenantHosts = prParentHost.keySet().stream()
                 .filter(node -> node.type() == NodeType.host)
                 .map(node -> node.hostname())
-                .collect(Collectors.toList());
+                .toList();
 
         boolean allHostsReplacable = tenantHosts.isEmpty() || nodeRepository.isReplaceable(
                 zone,
@@ -84,7 +84,7 @@ public class ChangeManagementAssessor {
             assessment.impact = getImpact(cluster, impactedStats, totalStats);
 
             return assessment;
-        }).collect(Collectors.toList());
+        }).toList();
 
         var hostAssessments = prParentHost.entrySet().stream().map((entry) -> {
             HostAssessment hostAssessment = new HostAssessment();
@@ -99,7 +99,7 @@ public class ChangeManagementAssessor {
                     .count();
 
             return hostAssessment;
-        }).collect(Collectors.toList());
+        }).toList();
 
         return new Assessment(clusterAssessments, hostAssessments);
     }
@@ -116,7 +116,7 @@ public class ChangeManagementAssessor {
                                 return node.parentHostname().get().value();
                             }).findFirst().stream()
                 )
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static Cluster clusterKey(Node node) {
@@ -127,7 +127,7 @@ public class ChangeManagementAssessor {
     }
 
     private static long[] clusterStats(Cluster cluster, List<Node> containerNodes) {
-        List<Node> clusterNodes = containerNodes.stream().filter(node -> cluster.equals(clusterKey(node))).collect(Collectors.toList());
+        List<Node> clusterNodes = containerNodes.stream().filter(node -> cluster.equals(clusterKey(node))).toList();
         long groups = clusterNodes.stream().map(Node::group).distinct().count();
         return new long[] { clusterNodes.size(), groups};
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
index a279cf46415..e16d52703e9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
@@ -108,7 +108,7 @@ public class ChangeRequestMaintainer extends ControllerMaintainer {
                         zone -> nodeRepository.list(zone, NodeFilter.all())
                                 .stream()
                                 .map(node -> node.hostname().value())
-                                .collect(Collectors.toList())
+                                .toList()
                 ));
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
index d1f6ddc1644..44081081f73 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
@@ -153,7 +153,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
                 .map(ZoneApi::getId)
                 .map(zoneId -> createResourceSnapshotsFromNodes(zoneId, nodeRepository.list(zoneId, NodeFilter.all())))
                 .flatMap(Collection::stream)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Stream<Instance> mapApplicationToInstances(Application application) {
@@ -204,7 +204,7 @@ public class ResourceMeterMaintainer extends ControllerMaintainer {
                 .values()
                 .stream()
                 .flatMap(list -> list.values().stream())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private boolean unlessNodeOwnerIsSystemApplication(Node node) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java
index d45818c2822..74bb89e4105 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RetriggerMaintainer.java
@@ -43,7 +43,7 @@ public class RetriggerMaintainer extends ControllerMaintainer {
             // Remove all jobs that has succeeded with the required job run and persist the list
             List<RetriggerEntry> remaining = retriggerEntries.stream()
                     .filter(this::needsTrigger)
-                    .collect(Collectors.toList());
+                    .toList();
             controller().curator().writeRetriggerEntries(remaining);
         } catch (Exception e) {
             logger.log(Level.WARNING, "Exception while triggering jobs", e);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java
index 820c67f2d44..583af2f3e20 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TenantRoleMaintainer.java
@@ -31,7 +31,7 @@ public class TenantRoleMaintainer extends ControllerMaintainer {
 
         var tenantsWithRoles = tenants.stream()
                 .map(Tenant::name)
-                .collect(Collectors.toList());
+                .toList();
         roleService.maintainRoles(tenantsWithRoles);
 
         var deletedTenants = controller().tenants().asList(true).stream()
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
index 163a570768f..03987efab8b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/UserManagementMaintainer.java
@@ -33,7 +33,7 @@ public class UserManagementMaintainer extends ControllerMaintainer {
         var applications = controller().applications().idList()
                 .stream()
                 .map(appId -> ApplicationId.from(appId.tenant(), appId.application(), InstanceName.defaultName()))
-                .collect(Collectors.toList());
+                .toList();
         roleMaintainer.deleteLeftoverRoles(tenants, applications);
 
         if (!controller().system().isPublic()) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java
index daba7e74f34..9211580abf1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java
@@ -140,7 +140,7 @@ public class VcmrMaintainer extends ControllerMaintainer {
                     }
                     var spareCapacity = hasSpareCapacity(zone, nodes);
                     return nodes.stream().map(node -> nextAction(zone, node, changeRequest, spareCapacity));
-                }).collect(Collectors.toList());
+                }).toList();
 
     }
 
@@ -151,7 +151,7 @@ public class VcmrMaintainer extends ControllerMaintainer {
                 .filter(entry -> entry.getValue().stream().anyMatch(isImpacted(changeRequest))) // Skip zones without impacted nodes
                 .collect(Collectors.toMap(
                         Map.Entry::getKey,
-                        entry -> entry.getValue().stream().filter(isImpacted(changeRequest)).collect(Collectors.toList())
+                        entry -> entry.getValue().stream().filter(isImpacted(changeRequest)).toList()
                 ));
     }
 
@@ -305,7 +305,7 @@ public class VcmrMaintainer extends ControllerMaintainer {
         var tenantHosts = nodes.stream()
                 .filter(node -> node.type() == NodeType.host)
                 .map(Node::hostname)
-                .collect(Collectors.toList());
+                .toList();
 
         return tenantHosts.isEmpty() ||
                 nodeRepository.isReplaceable(zoneId, tenantHosts);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
index f6a5bb5519d..957eada62b4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/metric/CostCalculator.java
@@ -50,7 +50,7 @@ public class CostCalculator {
                               .reachable().in(Environment.prod).in(CloudName.YAHOO).zones().stream()
                               .flatMap(zone -> uncheck(() -> nodeRepository.list(zone.getId(), NodeFilter.all()).stream()))
                               .filter(node -> node.owner().isPresent() && !node.owner().get().tenant().equals(SystemApplication.TENANT))
-                              .collect(Collectors.toList());
+                              .toList();
         var totalAllocation = ResourceAllocation.ZERO;
         for (var node : nodes) {
             Property property = propertyByTenantName.get(node.owner().get().tenant());
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
index 81ae787b507..a2960754570 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
@@ -143,7 +143,7 @@ public class NotificationsDb {
             if (!initial.equals(updated)) {
                 curatorDb.writeNotifications(deploymentSource.tenant(), updated);
             }
-            changed = newNotifications.stream().filter(n -> !notificationExists(n, initial, true)).collect(Collectors.toList());
+            changed = newNotifications.stream().filter(n -> !notificationExists(n, initial, true)).toList();
         }
         notifier.dispatch(changed, deploymentSource);
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
index 64dd51ce304..5d0e71b0727 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
@@ -107,7 +107,7 @@ public class Notifier {
     private void dispatch(Notification notification, TenantContacts.Type type, Collection<? extends TenantContacts.Contact> contacts) {
         switch (type) {
             case EMAIL:
-                dispatch(notification, contacts.stream().map(c -> (TenantContacts.EmailContact) c).collect(Collectors.toList()));
+                dispatch(notification, contacts.stream().map(c -> (TenantContacts.EmailContact) c).toList());
                 break;
             default:
                 throw new IllegalArgumentException("Unknown TenantContacts type " + type.name());
@@ -120,7 +120,7 @@ public class Notifier {
             mailer.send(mailOf(content, contacts.stream()
                     .filter(c -> c.email().isVerified())
                     .map(c -> c.email().getEmailAddress())
-                    .collect(Collectors.toList())));
+                    .toList()));
         } catch (MailerException e) {
             log.log(Level.SEVERE, "Failed sending email", e);
         } catch (MissingOptionalException e) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java
index 32f5e6714f2..a3ec30bb122 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java
@@ -126,7 +126,7 @@ public class BufferedLogStore {
         return logSerializer.fromJson(Arrays.stream(chunkIds, firstChunk, chunkIds.length)
                                             .mapToObj(chunkId -> buffer.readLog(id, type, chunkId))
                                             .flatMap(Optional::stream)
-                                            .collect(Collectors.toList()),
+                                            .toList(),
                                       after);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
index 149dba41c1e..be58370285a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
@@ -353,7 +353,7 @@ public class CuratorDb {
     public List<TenantName> readTenantNames() {
         return curator.getChildren(tenantRoot).stream()
                       .map(TenantName::from)
-                      .collect(Collectors.toList());
+                      .toList();
     }
 
     public void removeTenant(TenantName name) {
@@ -450,7 +450,7 @@ public class CuratorDb {
     public List<ApplicationId> applicationsWithJobs() {
         return curator.getChildren(jobRoot).stream()
                       .map(ApplicationId::fromSerializedForm)
-                      .collect(Collectors.toList());
+                      .toList();
     }
 
 
@@ -618,7 +618,7 @@ public class CuratorDb {
                 .stream()
                 .map(this::readChangeRequest)
                 .flatMap(Optional::stream)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public void writeChangeRequest(VespaChangeRequest changeRequest) {
@@ -682,7 +682,7 @@ public class CuratorDb {
                 .stream()
                 .map(this::getPendingMailVerification)
                 .flatMap(Optional::stream)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public void writePendingMailVerification(PendingMailVerification pendingMailVerification) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java
index e1181f1cede..02b718829f3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java
@@ -70,7 +70,7 @@ public class EndpointCertificateMetadataSerializer {
                 inspector.field(rootRequestIdField).asString(),
                 SlimeUtils.optionalString(inspector.field(leafRequestIdField)),
                 IntStream.range(0, inspector.field(requestedDnsSansField).entries())
-                        .mapToObj(i -> inspector.field(requestedDnsSansField).entry(i).asString()).collect(Collectors.toList()),
+                        .mapToObj(i -> inspector.field(requestedDnsSansField).entry(i).asString()).toList(),
                 inspector.field(issuerField).asString(),
                 inspector.field(expiryField).valid() ?
                         Optional.of(inspector.field(expiryField).asLong()) :
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java
index 26cd4acdb4c..6567b0076e7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java
@@ -72,7 +72,7 @@ class LogSerializer {
     Map<Step, List<LogEntry>> fromJson(List<byte[]> logJsons, long after) {
         return fromSlime(logJsons.stream()
                                  .map(SlimeUtils::jsonToSlime)
-                                 .collect(Collectors.toList()),
+                                 .toList(),
                          after);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java
index c200ca467da..a913e86dda9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/SupportAccessSerializer.java
@@ -68,14 +68,14 @@ public class SupportAccessSerializer {
 
         List<SupportAccessGrant> inactiveGrants = supportAccess.grantHistory().stream()
                 .filter(grant -> currentTime.isAfter(grant.certificate().getNotAfter().toInstant()))
-                .collect(Collectors.toList());
+                .toList();
 
         serializeHistoricEvents(root, supportAccess.changeHistory(), inactiveGrants);
 
         // Active grants should show up in the grant section
         List<SupportAccessGrant> activeGrants = supportAccess.grantHistory().stream()
                 .filter(grant -> currentTime.isBefore(grant.certificate().getNotAfter().toInstant()))
-                .collect(Collectors.toList());
+                .toList();
         serializeGrants(root, activeGrants, false);
         return slime;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
index bb55b2e8fcf..d1962b16120 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
@@ -117,7 +117,7 @@ public class BillingApiHandler extends ThreadedHttpRequestHandler {
                             bill.sumAdditionalCost()
                     };
                 })
-                .collect(Collectors.toList());
+                .toList();
         return new CsvResponse(headers, rows);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java
index 813d2b8d3e6..5148577880f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java
@@ -295,7 +295,7 @@ public class ChangeManagementApiHandler extends AuditLoggingRequestHandler {
                 .flatMap(zone -> controller.serviceRegistry().configServer().nodeRepository().list(zone, NodeFilter.all()).stream())
                 .filter(node -> node.switchHostname().map(switches::contains).orElse(false))
                 .map(node -> node.hostname().value())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<ZoneId> getProdZones() {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
index 8675f4f18c6..cfd6ea3d6d9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
@@ -134,7 +134,7 @@ public class OsApiHandler extends AuditLoggingRequestHandler {
         ZoneList zones = controller.zoneRegistry().zones().controllerUpgraded();
         if (path.get("region") != null) zones = zones.in(RegionName.from(path.get("region")));
         if (path.get("environment") != null) zones = zones.in(Environment.from(path.get("environment")));
-        return zones.zones().stream().map(ZoneApi::getId).collect(Collectors.toList());
+        return zones.zones().stream().map(ZoneApi::getId).toList();
     }
 
     private HttpResponse setOsVersion(HttpRequest request) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
index 05dd8257ad0..4184601179f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
@@ -146,7 +146,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
                                   .map(zone -> zone.environment().value() +
                                                "/region/" + zone.region().value())
                                   .sorted()
-                                  .collect(Collectors.toList());
+                                  .toList();
         return new ResourceResponse(request.getUri(), resources);
     }
 
@@ -168,7 +168,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
                                   .map(ApplicationName::value)
                                   .map(application -> "application/" + application)
                                   .sorted()
-                                  .collect(Collectors.toList());
+                                  .toList();
         return new ResourceResponse(request.getUri(), resources);
     }
 
@@ -185,7 +185,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
                                   .map(InstanceName::value)
                                   .map(instance -> "instance/" + instance)
                                   .sorted()
-                                  .collect(Collectors.toList());
+                                  .toList();
         return new ResourceResponse(request.getUri(), resources);
     }
 
@@ -202,7 +202,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
                                   .map(zone -> "environment/" + zone.environment().value() +
                                                "/region/" + zone.region().value())
                                   .sorted()
-                                  .collect(Collectors.toList());
+                                  .toList();
         return new ResourceResponse(request.getUri(), resources);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
index 7a8ef1d4ee6..c2e926f777b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
@@ -368,7 +368,7 @@ public class UserApiHandler extends ThreadedHttpRequestHandler {
 
     private boolean hasTrialCapacity() {
         if (! controller.system().isPublic()) return true;
-        var existing = controller.tenants().asList().stream().map(Tenant::name).collect(Collectors.toList());
+        var existing = controller.tenants().asList().stream().map(Tenant::name).toList();
         var trialTenants = controller.serviceRegistry().billingController().tenantsWithPlan(existing, PlanId.from("trial"));
         return maxTrialTenants.value() < 0 || trialTenants.size() < maxTrialTenants.value();
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
index a19006d8f9e..0b1411d5bc3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
@@ -116,7 +116,7 @@ public abstract class DeploymentRoutingContext implements RoutingContext {
                                                    .asList().stream()
                                                    .map(endpoint -> endpoint.upstreamName(deployment))
                                                    .distinct()
-                                                   .collect(Collectors.toList());
+                                                   .toList();
             if (upstreamNames.isEmpty()) {
                 throw new IllegalArgumentException("No upstream names found for " + deployment);
             }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java
index 39a0b6a8858..1e9f11e0349 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/rotation/RotationRepository.java
@@ -158,7 +158,7 @@ public class RotationRepository {
                                                          .flatMap(application -> application.instances().values().stream())
                                                          .flatMap(instance -> instance.rotations().stream())
                                                          .map(AssignedRotation::rotationId)
-                                                         .collect(Collectors.toList());
+                                                         .toList();
         Map<RotationId, Rotation> unassignedRotations = new LinkedHashMap<>(this.allRotations);
         assignedRotations.forEach(unassignedRotations::remove);
         return Collections.unmodifiableMap(unassignedRotations);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
index 81e9b1972b9..0e7fefba15d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/security/CloudAccessControl.java
@@ -72,7 +72,7 @@ public class CloudAccessControl implements AccessControl {
 
     private void requireTenantTrialLimitNotReached(List<Tenant> existing) {
         var trialPlanId = PlanId.from("trial");
-        var tenantNames = existing.stream().filter(tenant -> tenant.type() == Tenant.Type.cloud).map(Tenant::name).collect(Collectors.toList());
+        var tenantNames = existing.stream().filter(tenant -> tenant.type() == Tenant.Type.cloud).map(Tenant::name).toList();
         var trialTenants = billingController.tenantsWithPlan(tenantNames, trialPlanId).size();
 
         if (maxTrialTenants.value() >= 0 && maxTrialTenants.value() <= trialTenants) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
index d6b8f79dbe6..ed7bd924ccc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
@@ -155,7 +155,7 @@ public record VersionStatus(List<VespaVersion> versions) {
                 boolean isReleased = Collections.binarySearch(releasedVersions, statistics.version()) >= 0;
                 List<NodeVersion> nodeVersions = systemApplicationVersions.stream()
                                                                           .filter(nodeVersion -> nodeVersion.currentVersion().equals(statistics.version()))
-                                                                          .collect(Collectors.toList());
+                                                                          .toList();
                 VespaVersion vespaVersion = createVersion(statistics,
                                                           controllerVersions.keySet(),
                                                           systemVersion,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
index 0c908b1f035..38a4945e354 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
@@ -218,14 +218,14 @@ public final class ControllerTester {
     /** Set the zones and system for this and bootstrap infrastructure nodes */
     public ControllerTester setZones(List<ZoneId> zones) {
         ZoneApiMock.Builder builder = ZoneApiMock.newBuilder().withSystem(zoneRegistry().system());
-        zoneRegistry().setZones(zones.stream().map(zone -> builder.with(zone).build()).collect(Collectors.toList()));
+        zoneRegistry().setZones(zones.stream().map(zone -> builder.with(zone).build()).toList());
         configServer().bootstrap(zones, SystemApplication.notController());
         return this;
     }
 
     /** Set the routing method for given zones */
     public ControllerTester setRoutingMethod(List<ZoneId> zones, RoutingMethod routingMethod) {
-        zoneRegistry().setRoutingMethod(zones.stream().map(ZoneApiMock::from).collect(Collectors.toList()),
+        zoneRegistry().setRoutingMethod(zones.stream().map(ZoneApiMock::from).toList(),
                                         routingMethod);
         return this;
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/LinesComparatorTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/LinesComparatorTest.java
index 8d9f88ca0ca..9fd15a2f55d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/LinesComparatorTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/LinesComparatorTest.java
@@ -107,6 +107,6 @@ public class LinesComparatorTest {
 
     private static void assertDiff(String expected, String left, String right) {
         assertEquals(Optional.ofNullable(expected),
-                LinesComparator.diff(left.lines().collect(Collectors.toList()), right.lines().collect(Collectors.toList())));
+                LinesComparator.diff(left.lines().toList(), right.lines().toList()));
     }
 }
\ No newline at end of file
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index c0f0b67926a..7b82ec5ea55 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -197,7 +197,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
                                                                                                                                       43,
                                                                                                                                       "container",
                                                                                                                                       2))
-                                                                                           .collect(Collectors.toList())));
+                                                                                           .toList()));
     }
 
     /** The version given in the previous prepare call, or empty if no call has been made */
@@ -431,7 +431,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
                                                                                                      43,
                                                                                                      "container",
                                                                                                      1))
-                                                          .collect(Collectors.toList())));
+                                                          .toList()));
 
         DeploymentResult result = new DeploymentResult("foo", warnings.getOrDefault(id, List.of()));
         return () -> result;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
index f440d724b56..fbc72970e8d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
@@ -81,7 +81,7 @@ public class NodeRepositoryMock implements NodeRepository {
                                              (node.owner().isPresent() && filter.applications().contains(node.owner().get())))
                              .filter(node -> filter.hostnames().isEmpty() || filter.hostnames().contains(node.hostname()))
                              .filter(node -> filter.states().isEmpty() || filter.states().contains(node.state()))
-                             .collect(Collectors.toList());
+                             .toList();
     }
 
     @Override
@@ -101,7 +101,7 @@ public class NodeRepositoryMock implements NodeRepository {
                 applications.containsKey(zone)
                         ? applications.get(zone).keySet().stream()
                                       .map(id -> new ApplicationStats(id, Load.zero(), 0, 0))
-                                      .collect(Collectors.toList())
+                                      .toList()
                         : List.of();
 
         return new NodeRepoStats(0.0, 0.0, Load.zero(), Load.zero(), applicationStats);
@@ -336,7 +336,7 @@ public class NodeRepositoryMock implements NodeRepository {
         } else {
             nodes = list(zone, NodeFilter.all());
         }
-        putNodes(zone, nodes.stream().map(patcher).collect(Collectors.toList()));
+        putNodes(zone, nodes.stream().map(patcher).toList());
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java
index c2882da67d6..7aac44805b3 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneFilterMock.java
@@ -106,7 +106,7 @@ public class ZoneFilterMock implements ZoneList {
                         .filter(zone -> negate ?
                                 condition.negate().test(zone) :
                                 condition.test(zone))
-                        .collect(Collectors.toList()),
+                        .toList(),
                 zoneRoutingMethods, dynamicallyProvisioned, false);
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
index e7e542d2b82..8dfbec097cb 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunnerTest.java
@@ -251,7 +251,7 @@ public class JobRunnerTest {
         }
 
         // Thread is still trying to deploy tester -- delete application, and see all data is garbage collected.
-        assertEquals(Collections.singletonList(runId), jobs.active().stream().map(run -> run.id()).collect(Collectors.toList()));
+        assertEquals(Collections.singletonList(runId), jobs.active().stream().map(run -> run.id()).toList());
         tester.controllerTester().controller().applications().deleteApplication(TenantAndApplicationId.from(id), tester.controllerTester().credentialsFor(id.tenant()));
         assertEquals(Collections.emptyList(), jobs.active());
         assertEquals(runId, jobs.last(id, systemTest).get().id());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
index 4072fef3395..869a94c0449 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
@@ -625,7 +625,7 @@ public class MetricsReporterTest {
         var currentNodes = getNodes(zone, nodes, tester);
         var updatedNodes = currentNodes.stream()
                                        .map(node -> builderOps.apply(Node.builder(node)).build())
-                                       .collect(Collectors.toList());
+                                       .toList();
         tester.configServer().nodeRepository().putNodes(zone, updatedNodes);
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
index 0f5bb605c37..adfb0286202 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
@@ -58,7 +58,7 @@ public class OsUpgraderTest {
         // Bootstrap system
         List<ZoneId> nonControllerZones = Stream.of(zone1, zone2, zone3, zone4, zone5)
                 .map(ZoneApi::getVirtualId)
-                .collect(Collectors.toList());
+                .toList();
         tester.configServer().bootstrap(nonControllerZones, List.of(SystemApplication.tenantHost));
         tester.configServer().addNodes(List.of(zone0.getVirtualId()), List.of(SystemApplication.controllerHost));
 
@@ -181,7 +181,7 @@ public class OsUpgraderTest {
         return tester.controller().osVersionStatus().versions().entrySet().stream()
                      .filter(entry -> entry.getKey().version().equals(version))
                      .flatMap(entry -> entry.getValue().stream())
-                     .collect(Collectors.toList());
+                     .toList();
     }
 
     private void assertCurrent(Version version, SystemApplication application, ZoneApi... zones) {
@@ -210,7 +210,7 @@ public class OsUpgraderTest {
         return nodeRepository().list(zone.getVirtualId(), NodeFilter.all().applications(application.id()))
                                .stream()
                                .filter(node -> OsUpgrader.canUpgrade(node, false))
-                               .collect(Collectors.toList());
+                               .toList();
     }
 
     private Node failNodeIn(ZoneApi zone, SystemApplication application) {
@@ -266,7 +266,7 @@ public class OsUpgraderTest {
     }
 
     private OsUpgrader osUpgrader(UpgradePolicy upgradePolicy, CloudName cloud, boolean dynamicProvisioning) {
-        var zones = upgradePolicy.steps().stream().map(Step::zones).flatMap(Collection::stream).collect(Collectors.toList());
+        var zones = upgradePolicy.steps().stream().map(Step::zones).flatMap(Collection::stream).toList();
         tester.zoneRegistry()
               .setZones(zones)
               .setOsUpgradePolicy(cloud, upgradePolicy);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
index 7426e0dd23b..a7360f3d2d8 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
@@ -464,7 +464,7 @@ public class SystemUpgraderTest {
     private List<Node> listNodes(ZoneApi zone, SystemApplication application) {
         return nodeRepository().list(zone.getId(), NodeFilter.all().applications(application.id())).stream()
                                .filter(SystemUpgrader::eligibleForUpgrade)
-                               .collect(Collectors.toList());
+                               .toList();
     }
 
     private NodeRepositoryMock nodeRepository() {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
index fb85b876adf..7d7b66b035c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
@@ -295,7 +295,7 @@ public class RoutingPoliciesTest {
                 "c0.app2.tenant1.us-west-1.vespa.oath.cloud",
                 "c1.app2.tenant1.us-west-1.vespa.oath.cloud"
         );
-        assertEquals(expectedRecords.stream().sorted().collect(Collectors.toList()), tester.recordNames().stream().sorted().collect(Collectors.toList()));
+        assertEquals(expectedRecords.stream().sorted().toList(), tester.recordNames().stream().sorted().toList());
         assertEquals(4, tester.policiesOf(context2.instanceId()).size());
 
         // Deploy removes cluster from app1
@@ -1053,7 +1053,7 @@ public class RoutingPoliciesTest {
             return tester.controllerTester().nameService().findRecords(type, RecordName.from(name)).stream()
                          .map(Record::data)
                          .map(RecordData::asString)
-                         .collect(Collectors.toList());
+                         .toList();
         }
 
         /** Assert that an application endpoint points to given targets and weights */
@@ -1110,7 +1110,7 @@ public class RoutingPoliciesTest {
                 String latencyTarget = "latency/" + regionEndpoint + "/dns-zone-1/" + zone.value();
                 latencyTargets.add(latencyTarget);
             });
-            List<DeploymentId> deployments = zoneWeights.keySet().stream().map(z -> new DeploymentId(instance, z)).collect(Collectors.toList());
+            List<DeploymentId> deployments = zoneWeights.keySet().stream().map(z -> new DeploymentId(instance, z)).toList();
             String globalEndpoint = tester.controller().routing().readDeclaredEndpointsOf(instance)
                                           .named(endpointId)
                                           .targets(deployments)
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
index ee72a0ec339..f08e92a515d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
@@ -375,7 +375,7 @@ public class VersionStatusTest {
 
         // Test version order
         List<VespaVersion> versions = tester.controller().readVersionStatus().versions();
-        assertEquals(List.of("6.2", "6.4", "6.5"), versions.stream().map(version -> version.versionNumber().toString()).collect(Collectors.toList()));
+        assertEquals(List.of("6.2", "6.4", "6.5"), versions.stream().map(version -> version.versionNumber().toString()).toList());
 
         // Check release status is correct (static data in MockMavenRepository, and upgradeSystem "releases" a version).
         assertTrue(versions.get(0).isReleased());
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ContentPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ContentPolicy.java
index 3ce27ce6bdb..61d2873b874 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ContentPolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ContentPolicy.java
@@ -91,7 +91,7 @@ public class ContentPolicy extends SlobrokPolicy {
             synchronized void remove(Integer v) {
                 List<Integer> snapshot = list.get();
                 if (snapshot.contains(v)) {
-                    list.set(snapshot.stream().filter((item) -> !v.equals(item)).collect(Collectors.toList()));
+                    list.set(snapshot.stream().filter((item) -> !v.equals(item)).toList());
                 }
             }
             int size() {
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/TargetCachingSlobrokHostFetcherTest.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/TargetCachingSlobrokHostFetcherTest.java
index f2bdec5285f..f330f110241 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/TargetCachingSlobrokHostFetcherTest.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/TargetCachingSlobrokHostFetcherTest.java
@@ -43,7 +43,7 @@ public class TargetCachingSlobrokHostFetcherTest {
 
     private static List<Mirror.Entry> dummyEntries(int... indices) {
         return Arrays.stream(indices)
-                .mapToObj(index -> new Mirror.Entry(idOfIndex(index), lookupSpecOfIndex(index))).collect(Collectors.toList());
+                .mapToObj(index -> new Mirror.Entry(idOfIndex(index), lookupSpecOfIndex(index))).toList();
     }
 
     static class Fixture {
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java
index 0c3e69141e9..2ea41a9fd8c 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java
@@ -55,7 +55,7 @@ public class FileReferenceCompressor {
                         Files.find(Paths.get(directory.getAbsolutePath()),
                                    recurseDepth,
                                    (p, basicFileAttributes) -> basicFileAttributes.isRegularFile())
-                             .map(Path::toFile).collect(Collectors.toList()),
+                             .map(Path::toFile).toList(),
                         outputFile);
     }
 
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/FlagData.java b/flags/src/main/java/com/yahoo/vespa/flags/json/FlagData.java
index 28dbc588648..19837e7dbe1 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/json/FlagData.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/json/FlagData.java
@@ -83,7 +83,7 @@ public class FlagData {
         wireFlagData.id = id.toString();
 
         if (!rules.isEmpty()) {
-            wireFlagData.rules = rules.stream().map(Rule::toWire).collect(Collectors.toList());
+            wireFlagData.rules = rules.stream().map(Rule::toWire).toList();
         }
 
         wireFlagData.defaultFetchVector = FetchVectorHelper.toWire(defaultFetchVector);
@@ -126,17 +126,17 @@ public class FlagData {
 
     public static WireFlagDataList listToWire(List<FlagData> list) {
         WireFlagDataList wireList = new WireFlagDataList();
-        wireList.flags = list.stream().map(FlagData::toWire).collect(Collectors.toList());
+        wireList.flags = list.stream().map(FlagData::toWire).toList();
         return wireList;
     }
 
     public static List<FlagData> listFromWire(WireFlagDataList wireList) {
-        return wireList.flags.stream().map(FlagData::fromWire).collect(Collectors.toList());
+        return wireList.flags.stream().map(FlagData::fromWire).toList();
     }
 
     private static List<Rule> rulesFromWire(List<WireRule> wireRules) {
         if (wireRules == null) return List.of();
-        return wireRules.stream().map(Rule::fromWire).collect(Collectors.toList());
+        return wireRules.stream().map(Rule::fromWire).toList();
     }
 
     /** E.g. verify all RawFlag can be deserialized. */
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/RelationalPredicate.java b/flags/src/main/java/com/yahoo/vespa/flags/json/RelationalPredicate.java
index 8eaf38ed577..749c0e2f067 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/json/RelationalPredicate.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/json/RelationalPredicate.java
@@ -19,7 +19,7 @@ public class RelationalPredicate {
         // Make sure we try to match e.g. "<=" before "<" as the prefix of predicateString.
         List<RelationalOperator> operatorsByDecendingLength = Stream.of(RelationalOperator.values())
                 .sorted(Comparator.comparing(operator -> - operator.toText().length()))
-                .collect(Collectors.toList());
+                .toList();
 
         for (var operator : operatorsByDecendingLength) {
             if (predicateString.startsWith(operator.toText())) {
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/Rule.java b/flags/src/main/java/com/yahoo/vespa/flags/json/Rule.java
index d7cc5b4ddb2..bddaf8c9e0e 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/json/Rule.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/json/Rule.java
@@ -53,7 +53,7 @@ public class Rule {
         WireRule wireRule = new WireRule();
 
         if (!andConditions.isEmpty()) {
-            wireRule.andConditions = andConditions.stream().map(Condition::toWire).collect(Collectors.toList());
+            wireRule.andConditions = andConditions.stream().map(Condition::toWire).toList();
         }
 
         wireRule.value = valueToApply.map(RawFlag::asJsonNode).orElse(null);
@@ -64,7 +64,7 @@ public class Rule {
     public static Rule fromWire(WireRule wireRule) {
         List<Condition> conditions = wireRule.andConditions == null ?
                 Collections.emptyList() :
-                wireRule.andConditions.stream().map(Condition::fromWire).collect(Collectors.toList());
+                wireRule.andConditions.stream().map(Condition::fromWire).toList();
         Optional<RawFlag> value = wireRule.value == null ? Optional.empty() : Optional.of(JsonNodeRawFlag.fromJsonNode(wireRule.value));
         return new Rule(value, conditions);
     }
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/TestDescriptor.java b/hosted-api/src/main/java/ai/vespa/hosted/api/TestDescriptor.java
index 594cea732a6..0cfb93c4851 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/TestDescriptor.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/TestDescriptor.java
@@ -65,7 +65,7 @@ public class TestDescriptor {
     }
 
     private static List<String> getJsonArray(Cursor cursor, String field) {
-        return SlimeStream.fromArray(cursor.field(field), Inspector::asString).collect(Collectors.toList());
+        return SlimeStream.fromArray(cursor.field(field), Inspector::asString).toList();
     }
 
     public String version() {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/linguistics/LinguisticsAnnotatorTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/linguistics/LinguisticsAnnotatorTestCase.java
index 335fccf597e..92910557e5c 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/linguistics/LinguisticsAnnotatorTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/linguistics/LinguisticsAnnotatorTestCase.java
@@ -250,7 +250,7 @@ public class LinguisticsAnnotatorTestCase {
         final List<Token> tokens;
 
         public MyTokenizer(List<? extends Token> tokens, Map<String, String> replacementTerms) {
-            this.tokens = tokens.stream().map(token -> replace(token, replacementTerms)).collect(Collectors.toList());
+            this.tokens = tokens.stream().map(token -> replace(token, replacementTerms)).toList();
         }
 
         private Token replace(Token token, Map<String, String> replacementTerms) {
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Files.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Files.java
index 3f6d6b2d8d8..834c772132e 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Files.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Files.java
@@ -42,7 +42,7 @@ public class Files {
                             .stream()
                             .filter(file -> file.getParent().getPath().endsWith(dir.getRelative()))
                             .map(file -> PsiManager.getInstance(project).findFile(file))
-                            .collect(Collectors.toList());
+                            .toList();
     }
 
 }
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Path.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Path.java
index ce889c24fea..c84f9fbca2e 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Path.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/utils/Path.java
@@ -52,7 +52,7 @@ public final class Path {
      * Add path elements by splitting based on delimiter and appending to elements.
      */
     private static List<String> elementsOf(String path, String delimiter) {
-        return Arrays.stream(path.split(delimiter)).filter(e -> !"".equals(e)).collect(Collectors.toList());
+        return Arrays.stream(path.split(delimiter)).filter(e -> !"".equals(e)).toList();
     }
 
     /**
diff --git a/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStore.java b/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStore.java
index b2713cfcee3..77273ef981a 100644
--- a/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStore.java
+++ b/jdisc-cloud-aws/src/main/java/com/yahoo/jdisc/cloud/aws/AwsParameterStore.java
@@ -85,7 +85,7 @@ public class AwsParameterStore extends AbstractComponent implements SecretStore
         return secretStoreConfig.awsParameterStores()
                 .stream()
                 .map(config -> new AwsSettings(config.name(), config.role(), config.awsId(), config.externalId(), config.region()))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public static class AwsSettings {
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java
index 8f7d921944b..2dc1f549e07 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java
@@ -155,7 +155,7 @@ public class AthenzAuthorizationFilter extends JsonSecurityRequestFilterBase {
         return roles.stream()
                 .map(this::rolePrivilege)
                 .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private String rolePrivilege(AthenzRole role) {
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java
index 9fb709126bf..2feea00e171 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java
@@ -96,7 +96,7 @@ public class RuleBasedRequestFilter extends JsonSecurityRequestFilterBase {
         static List<Rule> fromConfig(List<RuleBasedFilterConfig.Rule> config) {
             return config.stream()
                     .map(Rule::new)
-                    .collect(Collectors.toList());
+                    .toList();
         }
 
         Rule(RuleBasedFilterConfig.Rule config) {
diff --git a/linguistics-components/src/main/java/com/yahoo/language/wordpiece/Model.java b/linguistics-components/src/main/java/com/yahoo/language/wordpiece/Model.java
index ce996b85313..a724d6542d5 100644
--- a/linguistics-components/src/main/java/com/yahoo/language/wordpiece/Model.java
+++ b/linguistics-components/src/main/java/com/yahoo/language/wordpiece/Model.java
@@ -85,7 +85,7 @@ class Model {
     }
 
     List<String> segment(String text, Tokenizer tokenizer) {
-        return embed(text, tokenizer).stream().map(tokenId -> tokenId2Token.get(tokenId)).collect(Collectors.toList());
+        return embed(text, tokenizer).stream().map(tokenId -> tokenId2Token.get(tokenId)).toList();
     }
 
     private Tuple2<String, Integer> findLongestSubstring(String candidate) {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
index 67c888a8d77..a3b02e608c2 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/core/MetricsManager.java
@@ -129,7 +129,7 @@ public class MetricsManager {
                 .map(builder -> builder.putDimensionsIfAbsent(globalDims))
                 .map(builder -> builder.putDimensionsIfAbsent(extraDimensions))
                 .map(builder -> adjustTimestamp(builder, startTime))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /**
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java
index 037fca95588..db8e18c3ef5 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/ValuesFetcher.java
@@ -45,7 +45,7 @@ public class ValuesFetcher {
         return metricsManager.getMetrics(vespaServices.getVespaServices(), Instant.now(), consumer)
                 .stream()
                 .filter(metricsPacket -> metricsPacket.consumers().contains(consumer))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public MetricsPacket.Builder[] fetchMetricsAsBuilders(String requestedConsumer) throws JsonRenderingException {
@@ -54,7 +54,7 @@ public class ValuesFetcher {
         List<MetricsPacket.Builder> builders = metricsManager.getMetricsAsBuilders(vespaServices.getVespaServices(), Instant.now(), consumer)
                 .stream()
                 .filter(builder -> builder.hasConsumer(consumer))
-                .collect(Collectors.toList());
+                .toList();
         return builders.toArray(new MetricsPacket.Builder[builders.size()]);
     }
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java
index 30acf6eacc8..54150f98687 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandler.java
@@ -87,7 +87,7 @@ public class ApplicationMetricsHandler extends HttpHandlerBase {
                         .stream()
                         .map(builder -> builder.putDimension(DimensionId.toDimensionId("hostname"), element.hostname))
                         .map(MetricsPacket.Builder::build))
-                .collect(Collectors.toList());
+                .toList();
         return new TextResponse(200, toPrometheusModel(metricsForAllNodes).serialize());
     }
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
index 6c27d10a62f..d4f04cdb3fc 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
@@ -185,7 +185,7 @@ public class ApplicationMetricsRetriever extends AbstractComponent implements Ru
         return nodesConfig.node().stream()
                 .map(Node::new)
                 .map(node-> new NodeMetricsClient(httpClient, node, Clock.systemUTC()))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     static CloseableHttpAsyncClient createHttpClient() {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java
index d05b251207d..21f884a27b7 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/dimensions/PublicDimensions.java
@@ -78,6 +78,6 @@ public final class PublicDimensions {
      * All public dimensions, common dimensions first, then dimensions for individual metrics
      */
     public static final List<String> publicDimensions = Stream.concat(commonDimensions.stream(), metricDimensions.stream())
-            .collect(Collectors.toList());
+            .toList();
 
 }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java
index 911c772c0e4..f475c06d634 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModel.java
@@ -84,7 +84,7 @@ public class YamasJsonModel {
 
         return metrics.keySet().stream()
                 .map(name -> new Metric(MetricId.toMetricId(name), metrics.get(name)))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     Map<DimensionId, String> getDimensionsById() {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java
index 148f48136f4..1a7c1b4df4d 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java
@@ -64,7 +64,7 @@ public class NodeMetricGatherer {
                     metricPacketBuilder.putDimensionsIfAbsent(applicationDimensions.getDimensions())
                     .putDimensionsIfAbsent(nodeDimensions.getDimensions())
                     .putDimensionsIfAbsent(metricsManager.getExtraDimensions()).build()
-        ).collect(Collectors.toList());
+        ).toList();
     }
 
     protected static void addObjectToBuilders(List<MetricsPacket.Builder> builders, JsonNode object)  {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java
index 5f8cbf0784d..d09f2aff3e5 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/ServiceHealthGatherer.java
@@ -30,7 +30,7 @@ public class ServiceHealthGatherer {
                             .putDimension(DimensionId.toDimensionId("metrictype"), "health")
                             .addConsumers(Set.of(ConsumerId.toConsumerId("Vespa")));
                 })
-                .collect(Collectors.toList());
+                .toList();
     }
 
 }
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java
index a1bc0eb0492..19124e8920d 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java
@@ -122,7 +122,7 @@ public class DimensionRenamer {
                 constraintsPerOperation.entrySet().stream()
                                                   .sorted(Comparator.comparingInt(entry -> - entry.getValue()))
                                                   .map(Map.Entry::getKey)
-                                                  .collect(Collectors.toList());
+                                                  .toList();
 
         List<RenameTarget> targets = new ArrayList<>();
         for (IntermediateOperation operation : prioritizedOperations) {
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/OrderedTensorType.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/OrderedTensorType.java
index b77960ff3fb..ceb9a27924d 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/OrderedTensorType.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/OrderedTensorType.java
@@ -58,7 +58,7 @@ public class OrderedTensorType {
     }
 
     public List<String> dimensionNames() {
-        return dimensions.stream().map(TensorType.Dimension::name).collect(Collectors.toList());
+        return dimensions.stream().map(TensorType.Dimension::name).toList();
     }
 
     private int[] createDimensionMap() {
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java
index ec8c97bdf64..e959dfe479d 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java
@@ -261,7 +261,7 @@ class GraphImporter {
                                                                      IntermediateGraph intermediateGraph) {
         return node.getInputList().stream()
                 .map(nodeName -> importOperation(nodeName, onnxGraph, intermediateGraph))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static void verifyNoWarnings(IntermediateGraph intermediateGraph) {
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java
index e49ab274b5a..d33a2e3eeda 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java
@@ -330,7 +330,7 @@ public abstract class IntermediateOperation {
     TensorType.Value resultValueType() {
         return TensorType.Value.largestOf(inputs.stream()
                                                 .map(input -> input.type().get().type().valueType())
-                                                .collect(Collectors.toList()));
+                                                .toList());
     }
 
     public abstract IntermediateOperation withInputs(List<IntermediateOperation> inputs);
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
index 76ee3a52d64..793bae9e2ab 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
@@ -45,7 +45,7 @@ public class RealNodeRepository implements NodeRepository {
     public void addNodes(List<AddNode> nodes) {
         List<NodeRepositoryNode> nodesToPost = nodes.stream()
                 .map(RealNodeRepository::nodeRepositoryNodeFromAddNode)
-                .collect(Collectors.toList());
+                .toList();
 
         configServerApi.post("/nodes/v2/node", nodesToPost, StandardConfigServerResponse.class)
                        .throwOnError("Failed to add nodes");
@@ -58,7 +58,7 @@ public class RealNodeRepository implements NodeRepository {
 
         return nodesForHost.nodes.stream()
                 .map(RealNodeRepository::createNodeSpec)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -149,7 +149,7 @@ public class RealNodeRepository implements NodeRepository {
 
         List<TrustStoreItem> trustStore = Optional.ofNullable(node.trustStore).orElse(List.of()).stream()
                 .map(item -> new TrustStoreItem(item.fingerprint, Instant.ofEpochMilli(item.expiry)))
-                .collect(Collectors.toList());
+                .toList();
 
 
         return new NodeSpec(
@@ -299,7 +299,7 @@ public class RealNodeRepository implements NodeRepository {
         node.currentFirmwareCheck = nodeAttributes.getCurrentFirmwareCheck().map(Instant::toEpochMilli).orElse(null);
         node.trustStore = nodeAttributes.getTrustStore().stream()
                 .map(item -> new NodeRepositoryNode.TrustStoreItem(item.fingerprint(), item.expiry().toEpochMilli()))
-                .collect(Collectors.toList());
+                .toList();
         Map<String, JsonNode> reports = nodeAttributes.getReports();
         node.reports = reports == null || reports.isEmpty() ? null : new TreeMap<>(reports);
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java
index 9060261b806..c1c08c15740 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java
@@ -137,7 +137,7 @@ public class ContainerOperations {
 
     /** Deletes the local images that are currently not in use by any container and not recently used. */
     public boolean deleteUnusedContainerImages(TaskContext context, List<DockerImage> excludes, Duration minImageAgeToDelete) {
-        List<String> excludedRefs = excludes.stream().map(DockerImage::asString).collect(Collectors.toList());
+        List<String> excludedRefs = excludes.stream().map(DockerImage::asString).toList();
         return imagePruner.removeUnusedImages(context, excludedRefs, minImageAgeToDelete);
     }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index 5ae0620fa7d..b2b587490ca 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -90,7 +90,7 @@ public class StorageMaintainer {
                 .stream()
                 .sorted(Comparator.comparing(FileFinder.FileAttributes::lastModifiedTime))
                 .flatMap(fa -> SyncFileInfo.forLogFile(archiveUri.get(), fa.path(), throttle, owner).stream())
-                .collect(Collectors.toList());
+                .toList();
 
         return syncClient.sync(context, syncFileInfos, throttle ? 1 : 100);
     }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/CoredumpCleanupRule.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/CoredumpCleanupRule.java
index 8d179b08bfb..102d6964ee5 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/CoredumpCleanupRule.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/CoredumpCleanupRule.java
@@ -52,9 +52,9 @@ public class CoredumpCleanupRule {
             List<FileAttributes> fileAttributes = FileFinder.files(containerCrashPath)
                     .maxDepth(1).stream()
                     .sorted(CORE_DUMP_FILE_ATTRIBUTE_COMPARATOR)
-                    .collect(Collectors.toList());
+                    .toList();
 
-            return mapFirstAndRemaining(fileAttributes, Priority.MEDIUM, Priority.HIGHEST).collect(Collectors.toList());
+            return mapFirstAndRemaining(fileAttributes, Priority.MEDIUM, Priority.HIGHEST).toList();
         }
     }
 
@@ -81,7 +81,7 @@ public class CoredumpCleanupRule {
 
             return fileAttributesByContainerDay.values().stream()
                     .flatMap(fa -> mapFirstAndRemaining(fa, Priority.MEDIUM, Priority.HIGH))
-                    .collect(Collectors.toList());
+                    .toList();
         }
     }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/LinearCleanupRule.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/LinearCleanupRule.java
index e6fcbf024f3..1798d83213d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/LinearCleanupRule.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/LinearCleanupRule.java
@@ -43,6 +43,6 @@ public class LinearCleanupRule implements DiskCleanupRule {
     public Collection<PrioritizedFileAttributes> prioritize() {
         return lister.get().stream()
                 .map(fa -> new PrioritizedFileAttributes(fa, prioritizer.apply(fa)))
-                .collect(Collectors.toList());
+                .toList();
     }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ArtifactProducers.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ArtifactProducers.java
index 4218df662da..4f72c1e0adb 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ArtifactProducers.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ArtifactProducers.java
@@ -30,7 +30,7 @@ class ArtifactProducers {
                             .filter(p -> p.getClass().equals(type))
                             .findAny()
                             .orElseThrow(() -> new IllegalArgumentException("No producer of type " + type)))
-                    .collect(Collectors.toList());
+                    .toList();
             if (producerMap.containsKey(alias)) {
                 throw new IllegalStateException("Alias name '" + alias + "' conflicts with producer");
             }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
index 43b4df7415e..ea393979bf6 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
@@ -139,7 +139,7 @@ public class VespaServiceDumperImpl implements VespaServiceDumper {
                     String classification = a.classification().map(Artifact.Classification::value).orElse(null);
                     return SyncFileInfo.forServiceDump(destination, a.file(), compression, owner, classification);
                 })
-                .collect(Collectors.toList());
+                .toList();
         ctx.log(log, Level.INFO,
                 "Uploading " + filesToUpload.size() + " file(s) with destination " + destination);
         if (!syncClient.sync(ctx, filesToUpload, Integer.MAX_VALUE)) {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
index 314844dc6eb..8b735f27aee 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
@@ -175,6 +175,6 @@ public class NodeAdminStateUpdater {
                              .stream()
                              .filter(node -> node.state() == NodeState.active)
                              .map(NodeSpec::hostname)
-                             .collect(Collectors.toList());
+                             .toList();
     }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinder.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinder.java
index 4caccc36b6f..ab702c85ffc 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinder.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileFinder.java
@@ -128,7 +128,7 @@ public class FileFinder {
                 List<Path> paths = deletedPaths.stream()
                         .map(basePath::relativize)
                         .sorted()
-                        .collect(Collectors.toList());
+                        .toList();
                 context.log(logger, "Deleted these paths in " + basePath + ": " + paths);
             }
         }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddresses.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddresses.java
index 148d80c9803..4b59e40cc82 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddresses.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/network/IPAddresses.java
@@ -47,7 +47,7 @@ public interface IPAddresses {
         return Stream.of(getAddresses(hostname))
                 .filter(inetAddress -> isOfType(inetAddress, ipVersion))
                 .map(InetAddresses::toAddrString)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /**
@@ -62,7 +62,7 @@ public interface IPAddresses {
                 .map(Inet6Address.class::cast)
                 .filter(inetAddress -> !inetAddress.isLinkLocalAddress())
                 .filter(inetAddress -> !inetAddress.isSiteLocalAddress())
-                .collect(Collectors.toList());
+                .toList();
 
         if (ipv6addresses.size() <= 1) return ipv6addresses.stream().findFirst();
 
@@ -92,13 +92,13 @@ public interface IPAddresses {
                 .filter(Inet4Address.class::isInstance)
                 .filter(inetAddress -> !inetAddress.isLoopbackAddress())
                 .map(Inet4Address.class::cast)
-                .collect(Collectors.toList());
+                .toList();
 
         if (ipv4Addresses.size() <= 1) return ipv4Addresses.stream().findFirst();
 
         List<Inet4Address> siteLocalIPv4Addresses = ipv4Addresses.stream()
                 .filter(InetAddress::isSiteLocalAddress)
-                .collect(Collectors.toList());
+                .toList();
 
         if (siteLocalIPv4Addresses.size() == 1) return Optional.of(siteLocalIPv4Addresses.get(0));
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandResult.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandResult.java
index 2032fecf4d9..faad85a14af 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandResult.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/process/CommandResult.java
@@ -37,7 +37,7 @@ public class CommandResult {
 
     /** Returns the output lines of the command, omitting trailing empty lines. */
     public List<String> getOutputLines() {
-        return getOutputLinesStream().collect(Collectors.toList());
+        return getOutputLinesStream().toList();
     }
 
     /** Returns the output lines as a stream, omitting trailing empty lines. */
@@ -78,7 +78,7 @@ public class CommandResult {
      * RuntimeException in UnexpectedOutputException w/output snippet. See map() for details.
      */
     public <R> List<R> mapEachLine(Function<String, R> mapper) {
-        return map(result -> result.getOutputLinesStream().map(mapper).collect(Collectors.toList()));
+        return map(result -> result.getOutputLinesStream().map(mapper).toList());
     }
 
     /**
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java
index 070bac3dfc9..975f5b8eb90 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java
@@ -103,7 +103,7 @@ public abstract class YumCommand<T extends YumCommand<T>> {
             CommandLine commandLine = terminal.newCommandLine(context);
             commandLine.add("yum", yumCommand.name());
             addParametersToCommandLine(commandLine);
-            commandLine.add(packages.stream().map(pkg -> pkg.toName()).collect(Collectors.toList()));
+            commandLine.add(packages.stream().map(pkg -> pkg.toName()).toList());
 
             // There's no way to figure out whether a yum command would have been a no-op.
             // Therefore, run the command and parse the output to decide.
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java
index 5d53f13420e..20a42aed3d5 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTester.java
@@ -54,7 +54,7 @@ public class YumTester extends Yum {
 
         private GenericYumCommandExpectation(CommandType commandType, String... packages) {
             this.commandType = commandType;
-            this.packages = Stream.of(packages).map(YumPackageName::fromString).collect(Collectors.toList());
+            this.packages = Stream.of(packages).map(YumPackageName::fromString).toList();
         }
 
         public GenericYumCommandExpectation withEnableRepo(String... repo) {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperationsTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperationsTest.java
index 9a5ca8c805e..701dd33cf55 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperationsTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperationsTest.java
@@ -53,7 +53,7 @@ public class ContainerOperationsTest {
         assertEquals(List.of(c1.name(), c3.name()), containerEngine.listContainers(context).stream()
                 .map(PartialContainer::name)
                 .sorted()
-                .collect(Collectors.toList()));
+                .toList());
     }
 
     private Container createContainer(String name, boolean managed) {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java
index cb9bcea7da3..997b613c337 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/NodeRepoMock.java
@@ -33,7 +33,7 @@ public class NodeRepoMock implements NodeRepository {
     public List<NodeSpec> getNodes(String baseHostName) {
         return nodeSpecByHostname.values().stream()
                 .filter(node -> baseHostName.equals(node.parentHostname().orElse(null)))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java
index 5366156cfbe..554a319f08b 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImplTest.java
@@ -227,7 +227,7 @@ class VespaServiceDumperImplTest {
         List<URI> actualFilenames = actualFiles.stream()
                 .map(SyncFileInfo::destination)
                 .sorted()
-                .collect(Collectors.toList());
+                .toList();
         assertEquals(expectedDestinations, actualFilenames);
     }
 
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
index 75dc4fffff8..bc4ac4eaa47 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java
@@ -190,7 +190,7 @@ public class NodeAdminStateUpdaterTest {
         // When doing batch suspend, only suspend the containers if the host is not active
         List<String> activeHostnames = nodeRepository.getNodes(hostHostname.value()).stream()
                 .map(NodeSpec::hostname)
-                .collect(Collectors.toList());
+                .toList();
         updater.converge(SUSPENDED);
         verify(orchestrator, times(1)).suspend(eq(hostHostname.value()), eq(activeHostnames));
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
index 9eefd4e60b7..d132d574658 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
@@ -70,11 +70,11 @@ public class MemoryMetricsDb implements MetricsDb {
         Instant startTime = clock().instant().minus(period);
         synchronized (lock) {
             if (hostnames.isEmpty())
-                return nodeTimeseries.values().stream().map(ns -> ns.keepAfter(startTime)).collect(Collectors.toList());
+                return nodeTimeseries.values().stream().map(ns -> ns.keepAfter(startTime)).toList();
             else
                 return hostnames.stream()
                                 .map(hostname -> nodeTimeseries.getOrDefault(hostname, new NodeTimeseries(hostname, List.of())).keepAfter(startTime))
-                                .collect(Collectors.toList());
+                                .toList();
         }
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java
index cd75a383b87..c25b0684f5a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java
@@ -72,14 +72,14 @@ public class NodeTimeseries {
     public NodeTimeseries keep(Predicate<NodeMetricSnapshot> filter) {
         return new NodeTimeseries(hostname, snapshots.stream()
                                                      .filter(snapshot -> filter.test(snapshot))
-                                                     .collect(Collectors.toList()));
+                                                     .toList());
     }
 
     public NodeTimeseries keepAfter(Instant oldestTime) {
         return new NodeTimeseries(hostname,
                                   snapshots.stream()
                                            .filter(snapshot -> snapshot.at().equals(oldestTime) || snapshot.at().isAfter(oldestTime))
-                                           .collect(Collectors.toList()));
+                                           .toList());
     }
 
     public NodeTimeseries keepGenerationAfterWarmup(long generation, Optional<Node> node) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
index bf9c7bddda1..e0199b5ddaf 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
@@ -176,7 +176,7 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb {
             var snapshots = getNodeSnapshots(clock.instant().minus(period), hostnames, newContext());
             return snapshots.entrySet().stream()
                             .map(entry -> new NodeTimeseries(entry.getKey(), entry.getValue()))
-                            .collect(Collectors.toList());
+                            .toList();
         }
         catch (SqlException e) {
             throw new IllegalStateException("Could not read node timeseries data in Quest stored in " + dataDir, e);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
index e7e1e371047..603056856e2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
@@ -66,7 +66,7 @@ public class CapacityChecker {
     public List<Node> nodesFromHostnames(List<String> hostnames) {
         return hostnames.stream().filter(nodeMap::containsKey)
                                     .map(nodeMap::get)
-                                    .collect(Collectors.toList());
+                                    .toList();
 
     }
 
@@ -79,7 +79,7 @@ public class CapacityChecker {
         var parentNames = hosts.stream().map(Node::hostname).collect(Collectors.toSet());
         return allNodes.nodeType(NodeType.tenant).state(relevantNodeStates).stream()
                 .filter(t -> parentNames.contains(t.parentHostname().orElse("")))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Optional<HostFailurePath> greedyHeuristicFindFailurePath(Map<Node, Integer> heuristic) {
@@ -88,7 +88,7 @@ public class CapacityChecker {
         List<Node> parentRemovalPriorityList = heuristic.entrySet().stream()
                                                         .sorted(this::hostMitigationOrder)
                                                         .map(Map.Entry::getKey)
-                                                        .collect(Collectors.toList());
+                                                        .toList();
 
         for (int i = 1; i <= parentRemovalPriorityList.size(); i++) {
             List<Node> hostsToRemove = parentRemovalPriorityList.subList(0, i);
@@ -170,7 +170,7 @@ public class CapacityChecker {
                 Map.Entry::getKey,
                 e -> e.getValue().stream()
                         .map(Node::allocation).flatMap(Optional::stream)
-                        .collect(Collectors.toList())
+                        .collect(Collectors.toCollection(ArrayList::new))
         ));
     }
 
@@ -189,7 +189,7 @@ public class CapacityChecker {
                                                     .filter(h -> !hostsToRemove.contains(h))
                                                     .filter(host -> !host.status().wantToRetire() &&
                                                             !host.status().wantToFail())
-                                                    .collect(Collectors.toList());
+                                                    .toList();
         if (validAllocationTargets.size() == 0)
             return Optional.of(HostRemovalFailure.none());
 
@@ -482,11 +482,11 @@ public class CapacityChecker {
 
         public AllocationFailureReasonList singularReasonFailures() {
             return new AllocationFailureReasonList(allocationFailureReasons.stream()
-                    .filter(reason -> reason.numberOfReasons() == 1).collect(Collectors.toList()));
+                    .filter(reason -> reason.numberOfReasons() == 1).toList());
         }
         public AllocationFailureReasonList multipleReasonFailures() {
             return new AllocationFailureReasonList(allocationFailureReasons.stream()
-                    .filter(reason -> reason.numberOfReasons() > 1).collect(Collectors.toList()));
+                    .filter(reason -> reason.numberOfReasons() > 1).toList());
         }
         public long size() {
             return allocationFailureReasons.size();
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
index c99c18262ec..d048f43973a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
@@ -85,7 +85,7 @@ public class ExpeditedChangeApplicationMaintainer extends ApplicationMaintainer
                                                             .map(event -> event.type() + (event.agent() == Agent.system ? "" : " by " + event.agent())))
                                     .sorted()
                                     .distinct()
-                                    .collect(Collectors.toList());
+                                    .toList();
 
         return reasons.isEmpty() ?
                 Optional.empty() :
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
index 2fb2f016c95..9e674c573da 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
@@ -86,7 +86,7 @@ public class FailedExpirer extends NodeRepositoryMaintainer {
 
     /** Recycle the nodes matching condition, and remove those nodes from the nodes list. */
     private void recycleIf(Predicate<Node> condition, List<Node> failedNodes, NodeList allNodes) {
-        List<Node> nodesToRecycle = failedNodes.stream().filter(condition).collect(Collectors.toList());
+        List<Node> nodesToRecycle = failedNodes.stream().filter(condition).toList();
         failedNodes.removeAll(nodesToRecycle);
         recycle(nodesToRecycle, allNodes);
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java
index 7310fe63736..c9f53b69dc6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java
@@ -154,7 +154,7 @@ public class HostCapacityMaintainer extends NodeRepositoryMaintainer {
                         return false;
                     }
                 })
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static List<Node> candidatesForRemoval(List<Node> nodes) {
@@ -295,7 +295,7 @@ public class HostCapacityMaintainer extends NodeRepositoryMaintainer {
                                   ClusterMembership.from(clusterSpec, index.next()),
                                   nodeResources,
                                   nodeRepository().clock().instant()))
-                .collect(Collectors.toList());
+                .toList();
 
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java
index bdc9f402d37..7e238470a0c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java
@@ -47,7 +47,7 @@ public class HostRetirer extends NodeRepositoryMaintainer {
                                                      .map(Node::cloudAccount)
                                                      .filter(cloudAccount -> !cloudAccount.isUnspecified())
                                                      .distinct()
-                                                     .collect(Collectors.toList());
+                                                     .toList();
         Map<String, List<HostEvent>> eventsByHostId = hostProvisioner.hostEventsIn(cloudAccounts).stream()
                                                                      .collect(Collectors.groupingBy(HostEvent::hostId));
         Instant now = nodeRepository().clock().instant();
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
index 1b4b9f9c54b..203bb664c1c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
@@ -137,7 +137,7 @@ public class NodeFailer extends NodeRepositoryMaintainer {
                 .filter(report -> report.getType().hostShouldBeFailed())
                 // The generated string is built from the report's ID, created time, and description only.
                 .map(report -> report.getReportId() + " reported " + report.getCreatedTime() + ": " + report.getDescription())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /** Returns whether node has any kind of hardware issue */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java
index 3cd97c64e4d..27945fad7f5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooter.java
@@ -42,7 +42,7 @@ public class NodeRebooter extends NodeRepositoryMaintainer {
         List<Node> nodesToReboot = nodeRepository().nodes().list(Node.State.active, Node.State.ready).stream()
                 .filter(node -> node.type().isHost())
                 .filter(this::shouldReboot)
-                .collect(Collectors.toList());
+                .toList();
 
         if (!nodesToReboot.isEmpty())
             nodeRepository().nodes().reboot(NodeListFilter.from(nodesToReboot));
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java
index 7da10ce085a..93b28d07471 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java
@@ -136,7 +136,7 @@ public class History {
      * This returns a copy of this history with all application level events removed and the log unchanged.
      */
     private History withoutApplicationEvents() {
-        return new History(events().stream().filter(e -> ! e.type().isApplicationLevel()).collect(Collectors.toList()), log);
+        return new History(events().stream().filter(e -> ! e.type().isApplicationLevel()).toList(), log);
     }
 
     /** Returns the empty history */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
index 54e48f881cd..2693fff3b39 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
@@ -380,7 +380,7 @@ public class IP {
             String hostname6 = resolver.resolveHostname(ipv6Address).orElseThrow(() -> new IllegalArgumentException("Could not resolve IP address: " + ipv6Address));
             List<String> ipv4Addresses = resolver.resolveAll(hostname6).stream()
                                                  .filter(IP::isV4)
-                                                 .collect(Collectors.toList());
+                                                 .toList();
             if (ipv4Addresses.size() > 1) {
                 throw new IllegalArgumentException("Hostname " + hostname6 + " resolved to more than 1 IPv4 address: " + ipv4Addresses);
             }
@@ -407,7 +407,7 @@ public class IP {
             String hostname4 = resolver.resolveHostname(ipAddress).orElseThrow(() -> new IllegalArgumentException("Could not resolve IP address: " + ipAddress));
             List<String> addresses = resolver.resolveAll(hostname4).stream()
                                              .filter(IP::isV4)
-                                             .collect(Collectors.toList());
+                                             .toList();
             if (addresses.size() != 1) {
                 throw new IllegalArgumentException("Hostname " + hostname4 + " did not resolve to exactly 1 address. " +
                                                    "Resolved: " + addresses);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
index b98c9c97437..345dccf5faf 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
@@ -264,7 +264,7 @@ public class Nodes {
     private List<Node> fail(List<Node> nodes, Agent agent, String reason, NestedTransaction transaction) {
         nodes = nodes.stream()
                      .map(n -> n.withWantToFail(false, agent, clock.instant()))
-                     .collect(Collectors.toList());
+                     .toList();
         return db.writeTo(Node.State.failed, nodes, agent, Optional.of(reason), transaction);
     }
 
@@ -290,7 +290,7 @@ public class Nodes {
             illegal("Could not deallocate " + nodeToDirty + ": " +
                     hostnamesNotAllowedToDirty + " are not in states [provisioned, failed, parked, breakfixed]");
 
-        return nodesToDirty.stream().map(node -> deallocate(node, agent, reason)).collect(Collectors.toList());
+        return nodesToDirty.stream().map(node -> deallocate(node, agent, reason)).toList();
     }
 
     /**
@@ -305,7 +305,7 @@ public class Nodes {
     }
 
     public List<Node> deallocate(List<Node> nodes, Agent agent, String reason, NestedTransaction transaction) {
-        return nodes.stream().map(node -> deallocate(node, agent, reason, transaction)).collect(Collectors.toList());
+        return nodes.stream().map(node -> deallocate(node, agent, reason, transaction)).toList();
     }
 
     public Node deallocate(Node node, Agent agent, String reason, NestedTransaction transaction) {
@@ -419,7 +419,7 @@ public class Nodes {
         NestedTransaction transaction = new NestedTransaction();
         List<Node> moved = list().childrenOf(hostname).asList().stream()
                                  .map(child -> move(child.hostname(), toState, agent, false, reason, transaction))
-                                 .collect(Collectors.toList());
+                                 .collect(Collectors.toCollection(ArrayList::new));
         moved.add(move(hostname, toState, agent, false, reason, transaction));
         transaction.commit();
         return moved;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java
index 2289ba4a0ea..74088e8d269 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializer.java
@@ -175,7 +175,7 @@ public class ApplicationSerializer {
     }
 
     private static List<ScalingEvent> scalingEventsFromSlime(Inspector eventArray) {
-        return SlimeUtils.entriesStream(eventArray).map(item -> scalingEventFromSlime(item)).collect(Collectors.toList());
+        return SlimeUtils.entriesStream(eventArray).map(item -> scalingEventFromSlime(item)).toList();
     }
 
     private static void toSlime(ScalingEvent event, Cursor object) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
index 5fe9eef7e73..aa935eaf272 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabase.java
@@ -63,7 +63,7 @@ public class CuratorDatabase {
                 .filter(hostAndPort -> !hostAndPort.isEmpty())
                 .map(hostAndPort -> hostAndPort.split(":")[0])
                 .map(HostName::of)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /** Create a reentrant lock */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
index 7f24f5e862b..47975c8354a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
@@ -349,7 +349,7 @@ public class CuratorDatabaseClient {
     public List<ApplicationId> readApplicationIds() {
         return db.getChildren(applicationsPath).stream()
                  .map(ApplicationId::fromSerializedForm)
-                 .collect(Collectors.toList());
+                 .toList();
     }
 
     public Optional<Application> readApplication(ApplicationId id) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index 3ee25c23f13..94707f7f429 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -400,14 +400,14 @@ public class NodeSerializer {
     private List<Address> addressesFromSlime(Inspector object) {
         return SlimeUtils.entriesStream(object.field(containersKey))
                          .map(elem -> new Address(elem.field(containerHostnameKey).asString()))
-                         .collect(Collectors.toList());
+                         .toList();
     }
 
     private List<TrustStoreItem> trustedCertificatesFromSlime(Inspector object) {
         return SlimeUtils.entriesStream(object.field(trustedCertificatesKey))
                          .map(elem -> new TrustStoreItem(elem.field(fingerprintKey).asString(),
                                                          Instant.ofEpochMilli(elem.field(expiresKey).asLong())))
-                         .collect(Collectors.toList());
+                         .toList();
     }
 
     // ----------------- Enum <-> string mappings ----------------------------------------
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
index 5e01ba5b0a6..40bad7022d6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
@@ -118,7 +118,7 @@ public class GroupPreparer {
                     List<NodeCandidate> candidates = provisionedHosts.stream()
                             .map(host -> NodeCandidate.createNewExclusiveChild(host.generateNode(),
                                     host.generateHost()))
-                            .collect(Collectors.toList());
+                            .toList();
                     allocation.offer(candidates);
                 };
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
index 605ef280c2e..178ea6ed514 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
@@ -116,7 +116,7 @@ public class InfraDeployerImpl implements InfraDeployer {
 
                     duperModel.infraApplicationActivated(
                             application.getApplicationId(),
-                            hostSpecs.stream().map(HostSpec::hostname).map(HostName::of).collect(Collectors.toList()));
+                            hostSpecs.stream().map(HostSpec::hostname).map(HostName::of).toList());
 
                     logger.log(Level.FINE, () -> generateActivationLogMessage(hostSpecs, application.getApplicationId()));
                 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
index 26a3f231a31..ebb05b69e1a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
@@ -164,7 +164,7 @@ public class LoadBalancerProvisioner {
         var now = nodeRepository.clock().instant();
         var deactivatedLoadBalancers = loadBalancers.stream()
                                                     .map(lb -> lb.with(LoadBalancer.State.inactive, now))
-                                                    .collect(Collectors.toList());
+                                                    .toList();
         db.writeLoadBalancers(deactivatedLoadBalancers, LoadBalancer.State.active, transaction);
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
index 8d350e304a2..61ca7c914c0 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
@@ -410,7 +410,7 @@ class NodeAllocation {
             nodes.put(candidate.toNode().hostname(), candidate);
         }
 
-        return nodes.values().stream().map(n -> n.toNode()).collect(Collectors.toList());
+        return nodes.values().stream().map(n -> n.toNode()).toList();
     }
 
     List<Node> reservableNodes() {
@@ -427,7 +427,7 @@ class NodeAllocation {
         return nodes.values().stream()
                 .filter(predicate)
                 .map(n -> n.toNode())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     /** Returns the number of nodes accepted this far */
@@ -440,7 +440,7 @@ class NodeAllocation {
 
     /** Prefer to retire nodes we want the least */
     private List<NodeCandidate> byRetiringPriority(Collection<NodeCandidate> candidates) {
-        return candidates.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
+        return candidates.stream().sorted(Comparator.reverseOrder()).toList();
     }
 
     /** Prefer to unretire nodes we don't want to retire, and otherwise those with lower index */
@@ -448,7 +448,7 @@ class NodeAllocation {
         return candidates.stream()
                          .sorted(Comparator.comparing(NodeCandidate::wantToRetire)
                                            .thenComparing(n -> n.allocation().get().membership().index()))
-                         .collect(Collectors.toList());
+                         .toList();
     }
 
     public String allocationFailureDetails() {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
index 820a654c620..139e8848ab1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
@@ -78,7 +78,7 @@ class Preparer {
                 NodeList activeHosts = allNodesAndHosts.nodes().state(Node.State.active).parents().nodeType(requestedNodes.type().hostType());
                 accepted = accepted.stream()
                                    .filter(node -> node.parentHostname().isEmpty() || activeHosts.parentOf(node).isPresent())
-                                   .collect(Collectors.toList());
+                                   .toList();
             }
 
             replace(acceptedNodes, accepted);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java
index 8a66a9394b2..42904bb6d68 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LocksResponse.java
@@ -77,7 +77,7 @@ public class LocksResponse extends HttpResponse {
 
         List<RecordedLockAttempts> historicRecordings = LockStats.getGlobal().getHistoricRecordings().stream()
                 .sorted(Comparator.comparing(RecordedLockAttempts::duration).reversed())
-                .collect(Collectors.toList());
+                .toList();
         if (!historicRecordings.isEmpty()) {
             Cursor recordingsCursor = root.setArray("recordings");
             historicRecordings.forEach(recording -> setRecording(recordingsCursor.addObject(), recording));
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
index 328be3b32b8..2c93992dcab 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
@@ -269,7 +269,7 @@ public class NodePatcher {
         List<TrustStoreItem> trustStoreItems =
                 SlimeUtils.entriesStream(inspector)
                         .map(TrustStoreItem::fromSlime)
-                        .collect(Collectors.toList());
+                        .toList();
         return node.with(trustStoreItems);
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java
index 20a1621b1d2..63386449f0c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java
@@ -232,7 +232,7 @@ public class MockDeployer implements Deployer {
             return clusterContexts.stream()
                     .map(clusterContext -> clusterContext.prepare(provisioner))
                     .flatMap(List::stream)
-                    .collect(Collectors.toList());
+                    .toList();
         }
 
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
index 15ee064b59f..20612e2ad66 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
@@ -184,7 +184,7 @@ public class MockHostProvisioner implements HostProvisioner {
                                     : hostType.childNodeType().name() + i;
                             return new Address(hostname);
                         })
-                        .collect(Collectors.toList());
+                        .toList();
     }
 
     public Node withIpAssigned(Node node) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeListMicroBenchmarkTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeListMicroBenchmarkTest.java
index b7f9dcb8e8a..85338bdb2b4 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeListMicroBenchmarkTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeListMicroBenchmarkTest.java
@@ -38,7 +38,7 @@ public class NodeListMicroBenchmarkTest {
     public void testChildrenOf() {
         List<Node> nodes = createHosts();
 
-        List<Node> childNodes = nodes.stream().map(host -> createNodes(host.hostname())).flatMap(Collection::stream).collect(Collectors.toList());
+        List<Node> childNodes = nodes.stream().map(host -> createNodes(host.hostname())).flatMap(Collection::stream).toList();
         nodes.addAll(childNodes);
         NodeList nodeList = new NodeList(nodes, false);
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/RealDataScenarioTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/RealDataScenarioTest.java
index 3dd76c76cac..e569e9b0382 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/RealDataScenarioTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/RealDataScenarioTest.java
@@ -120,7 +120,7 @@ public class RealDataScenarioTest {
         List<HostSpec> hostSpecs = IntStream.range(0, capacities.length)
                                             .mapToObj(i -> tester.provisioner().prepare(app, specs[i], capacities[i], log::log))
                                             .flatMap(Collection::stream)
-                                            .collect(Collectors.toList());
+                                            .toList();
         NestedTransaction transaction = new NestedTransaction();
         tester.provisioner().activate(hostSpecs, new ActivationContext(0), new ApplicationTransaction(new ProvisionLock(app, () -> {}), transaction));
         transaction.commit();
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java
index bba06fb9080..311428de8ff 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java
@@ -209,7 +209,7 @@ public class Fixture {
         }
 
         public Fixture.Builder hostFlavors(NodeResources ... hostResources) {
-            this.hostFlavors = Arrays.stream(hostResources).map(r -> new Flavor(r)).collect(Collectors.toList());
+            this.hostFlavors = Arrays.stream(hostResources).map(r -> new Flavor(r)).toList();
             return this;
         }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
index 59080f60982..4978fe431dc 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
@@ -311,7 +311,7 @@ public class FailedExpirerTest {
         public FailureScenario setReady(String... hostname) {
             List<Node> nodes = Stream.of(hostname)
                                      .map(this::get)
-                                     .collect(Collectors.toList());
+                                     .toList();
             nodes = nodeRepository.nodes().deallocate(nodes, Agent.system, getClass().getSimpleName());
             tester.move(Node.State.ready, nodes);
             return this;
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java
index b26d9f677db..a1b2fb5d0ad 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java
@@ -690,7 +690,7 @@ public class HostCapacityMaintainerTest {
                             flavor.resources(),
                             Generation.initial(),
                             false));
-            List<Address> addresses = Stream.of(additionalHostnames).map(Address::new).collect(Collectors.toList());
+            List<Address> addresses = Stream.of(additionalHostnames).map(Address::new).toList();
             Node.Builder builder = Node.create("fake-id-" + hostname, hostname, flavor, state, nodeType)
                     .ipConfig(new IP.Config(state == Node.State.active ? Set.of("::1") : Set.of(), Set.of(), addresses));
             parentHostname.ifPresent(builder::parentHostname);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java
index d47b8955b56..d7e2dbb6f58 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java
@@ -78,7 +78,7 @@ public class InactiveAndFailedExpirerTest {
         Node ready = tester.move(Node.State.ready, dirty.asList().get(0));
         assertEquals("Allocated history is removed on readying",
                 List.of(History.Event.Type.provisioned, History.Event.Type.readied),
-                ready.history().events().stream().map(History.Event::type).collect(Collectors.toList()));
+                ready.history().events().stream().map(History.Event::type).toList());
 
         // Dirty times out for the other one
         tester.advanceTime(Duration.ofMinutes(14));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
index 77dbc86769f..4f23ea3a578 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
@@ -306,7 +306,7 @@ public class MetricsReporterTest {
     private Number getMetric(String name, TestMetric metric, Map<String, String> dimensions) {
         List<TestMetric.TestContext> metrics = metric.context.get(name).stream()
                                                              .filter(ctx -> ctx.properties.entrySet().containsAll(dimensions.entrySet()))
-                                                             .collect(Collectors.toList());
+                                                             .toList();
         if (metrics.isEmpty()) throw new IllegalArgumentException("No value found for metric " + name + " with dimensions " + dimensions);
         return metrics.get(metrics.size() - 1).value;
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java
index 8a84c81e082..d379513a8f9 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java
@@ -49,7 +49,7 @@ public class NodeMetricsDbMaintainerTest {
         assertEquals(2, timeseriesList.size());
         List<NodeMetricSnapshot> allSnapshots = timeseriesList.stream()
                                                               .flatMap(timeseries -> timeseries.asList().stream())
-                                                              .collect(Collectors.toList());
+                                                              .toList();
         assertTrue(allSnapshots.stream().anyMatch(snapshot -> snapshot.inService()));
         assertTrue(allSnapshots.stream().anyMatch(snapshot -> ! snapshot.inService()));
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooterTest.java
index 5613f1961f8..fb3c6ec89d9 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooterTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRebooterTest.java
@@ -142,7 +142,7 @@ public class NodeRebooterTest {
 
     /** Returns the subset of the given nodes which have the given current reboot generation */
     private List<Node> withCurrentRebootGeneration(long generation, List<Node> nodes) {
-        return nodes.stream().filter(n -> n.status().reboot().current() == generation).collect(Collectors.toList());
+        return nodes.stream().filter(n -> n.status().reboot().current() == generation).toList();
     }
 
     private static ProvisioningTester createTester(Duration rebootInterval, InMemoryFlagSource flagSource) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java
index 329e6c833a9..32886733856 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirerTest.java
@@ -44,7 +44,7 @@ public class ProvisionedExpirerTest {
     private void populateNodeRepo() {
         var nodes = IntStream.range(0, 25)
                              .mapToObj(i -> Node.create("id-" + i, "host-" + i, new Flavor(NodeResources.unspecified()), Node.State.provisioned, NodeType.host).build())
-                             .collect(Collectors.toList());
+                             .toList();
         tester.nodeRepository().database().addNodesInState(nodes, Node.State.provisioned, Agent.system);
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancerTest.java
index 6be07f6f702..6895f5eeae7 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancerTest.java
@@ -233,7 +233,7 @@ public class SwitchRebalancerTest {
     private static MockDeployer deployer(ProvisioningTester tester, Capacity capacity, ClusterSpec first, ClusterSpec... rest) {
         List<ClusterContext> clusterContexts = Stream.concat(Stream.of(first), Stream.of(rest))
                                                      .map(spec -> new ClusterContext(app, spec, capacity))
-                                                     .collect(Collectors.toList());
+                                                     .toList();
         ApplicationContext context = new ApplicationContext(app, clusterContexts);
         return new MockDeployer(tester.provisioner(), tester.clock(), Map.of(app, context));
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java
index ccd60ded517..f8fe1c1ef73 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/HistoryTest.java
@@ -28,7 +28,7 @@ public class HistoryTest {
         assertEquals(3, history.log().size());
         assertEquals("Most recent events are kept",
                      List.of(2L, 3L, 4L),
-                     history.log().stream().map(e -> e.at().toEpochMilli()).collect(Collectors.toList()));
+                     history.log().stream().map(e -> e.at().toEpochMilli()).toList());
     }
 
     private static List<Event> shuffledEvents(int count) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java
index be35176ed98..f4610e722a8 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java
@@ -66,7 +66,7 @@ public class IPTest {
                            .map(IP::parse)
                            .sorted(IP.NATURAL_ORDER)
                            .map(IP::asString)
-                           .collect(Collectors.toList())
+                           .toList()
         );
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
index 1741dbdb749..4635d3ff525 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
@@ -129,7 +129,7 @@ public class OsVersionsTest {
                          minVersion(nodesUpgrading, OsVersion::wanted));
             var nodesOnLowestVersion = nodes.asList().stream()
                                             .sorted(Comparator.comparing(node -> node.status().osVersion().current().orElse(Version.emptyVersion)))
-                                            .collect(Collectors.toList())
+                                            .toList()
                                             .subList(0, maxActiveUpgrades);
             assertEquals("Nodes on lowest version are told to upgrade",
                          nodesUpgrading.asList(), nodesOnLowestVersion);
@@ -543,7 +543,7 @@ public class OsVersionsTest {
         return nodes.stream()
                     .map(Node::hostname)
                     .flatMap(hostname -> tester.nodeRepository().nodes().node(hostname).stream())
-                    .collect(Collectors.toList());
+                    .toList();
 
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
index e8155234989..ab487cc7d04 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
@@ -167,7 +167,7 @@ public class NodeSerializerTest {
         assertEquals(3, node.allocation().get().restartGeneration().wanted());
         assertEquals(4, node.allocation().get().restartGeneration().current());
         assertEquals(List.of(History.Event.Type.provisioned, History.Event.Type.reserved),
-                     node.history().events().stream().map(History.Event::type).collect(Collectors.toList()));
+                     node.history().events().stream().map(History.Event::type).toList());
         assertTrue(node.allocation().get().removable());
         assertEquals(NodeType.tenant, node.type());
     }
@@ -368,7 +368,7 @@ public class NodeSerializerTest {
         assertEquals(Version.fromString("7.2"), serialized.status().osVersion().current().get());
         var osUpgradedEvents = serialized.history().events().stream()
                                          .filter(event -> event.type() == History.Event.Type.osUpgraded)
-                                         .collect(Collectors.toList());
+                                         .toList();
         assertEquals("OS upgraded event is added", 1, osUpgradedEvents.size());
         assertEquals("Duplicate updates of same version uses earliest instant", Instant.ofEpochMilli(123),
                      osUpgradedEvents.get(0).at());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
index ea9c0e1193d..d26ac4d3916 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
@@ -245,12 +245,12 @@ public class AclProvisioningTest {
                 .flatMap(List::stream)
                 .distinct()
                 .sorted(Comparator.comparing(TrustedNode::hostname))
-                .collect(Collectors.toList());
+                .toList();
         List<TrustedNode> actualTrustedNodes = actual.stream()
                 .flatMap(acl -> acl.trustedNodes().stream())
                 .distinct()
                 .sorted(Comparator.comparing(TrustedNode::hostname))
-                .collect(Collectors.toList());
+                .toList();
         assertEquals(expectedTrustedNodes, actualTrustedNodes);
 
         Set<String> actualTrustedNetworks = actual.stream()
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java
index 623ce47b611..66b278a52db 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java
@@ -190,7 +190,7 @@ public class DynamicProvisioningTest {
         var indices = tester.nodeRepository().nodes().list().owner(app).stream()
                 .map(node -> node.allocation().get().membership().index())
                 .collect(Collectors.toSet());
-        assertTrue(indices.containsAll(IntStream.range(0, 10).boxed().collect(Collectors.toList())));
+        assertTrue(indices.containsAll(IntStream.range(0, 10).boxed().toList()));
     }
 
     @Test
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java
index 31643b2ac79..ea2af5f3fca 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java
@@ -167,7 +167,7 @@ public class HostCapacityTest {
     }
 
     private Node setupHostWithAdditionalHostnames(String hostHostname, String... additionalHostnames) {
-        List<Address> addresses = Stream.of(additionalHostnames).map(Address::new).collect(Collectors.toList());
+        List<Address> addresses = Stream.of(additionalHostnames).map(Address::new).toList();
 
         doAnswer(invocation -> ((Flavor)invocation.getArguments()[0]).resources())
                 .when(hostResourcesCalculator).advertisedResourcesOf(any());
@@ -181,7 +181,7 @@ public class HostCapacityTest {
     }
 
     private boolean hasCapacity(NodeResources requestedCapacity, Node host, Node... remainingNodes) {
-        List<Node> nodes = Stream.concat(Stream.of(host), Stream.of(remainingNodes)).collect(Collectors.toList());
+        List<Node> nodes = Stream.concat(Stream.of(host), Stream.of(remainingNodes)).toList();
         var capacity = new HostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator);
         return capacity.hasCapacity(host, requestedCapacity);
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java
index 3c98cdef93b..9a38cbbba44 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java
@@ -133,7 +133,7 @@ public class InfraDeployerImplTest {
     @SuppressWarnings("unchecked")
     private void verifyActivated(String... hostnames) {
         verify(duperModelInfraApi).infraApplicationActivated(
-                eq(application.getApplicationId()), eq(Stream.of(hostnames).map(HostName::of).collect(Collectors.toList())));
+                eq(application.getApplicationId()), eq(Stream.of(hostnames).map(HostName::of).toList()));
         ArgumentMatcher<ApplicationTransaction> transactionMatcher = t -> {
             assertEquals(application.getApplicationId(), t.application());
             return true;
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
index c7a2c94783b..30bd1250430 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
@@ -377,13 +377,13 @@ public class LoadBalancerProvisionerTest {
         List<String> reals = loadBalancers.get(0).instance().get().reals().stream()
                                           .map(real -> real.hostname().value())
                                           .sorted()
-                                          .collect(Collectors.toList());
+                                          .toList();
         List<String> activeNodes = tester.nodeRepository().nodes().list(states)
                                          .owner(application)
                                          .cluster(cluster)
                                          .hostnames().stream()
                                          .sorted()
-                                         .collect(Collectors.toList());
+                                         .toList();
         assertEquals("Load balancer targets active nodes of " + application + " in " + cluster,
                      activeNodes, reals);
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java
index 12f1abf0cf5..4af5728f167 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java
@@ -194,7 +194,7 @@ public class NodeTypeProvisioningTest {
             // Verify that wantToRetire has been propagated
             List<Node> nodesCurrentlyRetiring = nodes.stream()
                     .filter(node -> node.allocation().get().membership().retired())
-                    .collect(Collectors.toList());
+                    .toList();
             assertEquals(5, nodesCurrentlyRetiring.size());
 
             // The retiring nodes should be the nodes we marked for retirement
@@ -211,7 +211,7 @@ public class NodeTypeProvisioningTest {
             // Verify that wantToRetire has been propagated
             List<Node> nodesCurrentlyRetiring = nodes.stream()
                     .filter(node -> node.allocation().get().membership().retired())
-                    .collect(Collectors.toList());
+                    .toList();
             assertEquals(5, nodesCurrentlyRetiring.size());
         }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
index bf15e4bbe1c..405d9578c95 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
@@ -572,7 +572,7 @@ public class ProvisioningTester {
 
     /** Returns the hosts from the input list which are not retired */
     public List<HostSpec> nonRetired(Collection<HostSpec> hosts) {
-        return hosts.stream().filter(host -> ! host.membership().get().retired()).collect(Collectors.toList());
+        return hosts.stream().filter(host -> ! host.membership().get().retired()).toList();
     }
 
     public void assertAllocatedOn(String explanation, String hostFlavor, ApplicationId app) {
@@ -595,7 +595,7 @@ public class ProvisioningTester {
             Optional<String> allocatedSwitchHostname = allNodes.parentOf(node).flatMap(Node::switchHostname);
             return allocatedSwitchHostname.isPresent() &&
                    allocatedSwitchHostname.get().equals(switchHostname);
-        }).collect(Collectors.toList());
+        }).toList();
     }
 
     public Set<String> switchesOf(NodeList applicationNodes, NodeList allNodes) {
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorUtil.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorUtil.java
index 54b0bc4ddd1..3093a2a9828 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorUtil.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorUtil.java
@@ -76,7 +76,7 @@ public class OrchestratorUtil {
         Set<ApplicationInstanceReference> references = serviceMonitor.getAllApplicationInstanceReferences();
         List<ApplicationInstanceReference> referencesWithId = references.stream()
                 .filter(a -> OrchestratorUtil.toApplicationId(a).equals(applicationid))
-                .collect(Collectors.toList());
+                .toList();
 
         if (referencesWithId.size() > 1) {
             String msg = String.format("ApplicationId '%s' was not unique but mapped to '%s'", applicationid, referencesWithId);
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientImpl.java
index 25567cb00a1..1887d19621e 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientImpl.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientImpl.java
@@ -167,7 +167,7 @@ public class ClusterControllerClientImpl implements ClusterControllerClient {
                                //  * if host 2 responds, it will redirect to master if necessary; otherwise
                                //  * if host 3 responds, it may redirect to master if necessary (if they're up
                                //    after all), but more likely there's no quorum and this will fail too.
-                               : HostStrategy.ordered(hosts.stream().map(ClusterControllerClientImpl::toUrl).collect(Collectors.toList()));
+                               : HostStrategy.ordered(hosts.stream().map(ClusterControllerClientImpl::toUrl).toList());
     }
 
     static URI toUrl(HostName host) {
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ClusterApiImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ClusterApiImpl.java
index 4a10cde66b3..a276c08080b 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ClusterApiImpl.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ClusterApiImpl.java
@@ -196,7 +196,7 @@ class ClusterApiImpl implements ClusterApi {
             description.append(" ");
 
             final int nodeLimit = 3;
-            description.append(suspended.stream().sorted().distinct().limit(nodeLimit).collect(Collectors.toList()).toString());
+            description.append(suspended.stream().sorted().distinct().limit(nodeLimit).toList().toString());
             if (suspended.size() > nodeLimit) {
                 description.append(" and " + (suspended.size() - nodeLimit) + " others");
             }
@@ -216,7 +216,7 @@ class ClusterApiImpl implements ClusterApi {
                     downElsewhere.stream().map(ServiceInstance::toString).sorted(),
                     missingServices > 0 ? Stream.of(descriptionOfMissingServices) : Stream.of())
                     .limit(serviceLimit)
-                    .collect(Collectors.toList())
+                    .toList()
                     .toString());
 
             if (downElsewhereTotal > serviceLimit) {
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java
index c4bcb48a6a6..9a6fc75944d 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/NodeGroup.java
@@ -43,7 +43,7 @@ public class NodeGroup {
     }
 
     public List<HostName> getHostNames() {
-        return hostNames.stream().sorted().collect(Collectors.toList());
+        return hostNames.stream().sorted().toList();
     }
 
     public String toCommaSeparatedString() {
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java
index a869a3e84b0..f2133d32867 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java
@@ -94,7 +94,7 @@ public class VespaModelUtil {
         return clusterControllerInstances.stream()
                 .sorted(CLUSTER_CONTROLLER_INDEX_COMPARATOR)
                 .map(serviceInstance -> serviceInstance.hostName())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private static Collection<ServiceCluster> filter(Set<ServiceCluster> controllerClusters,
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/SuspensionReasons.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/SuspensionReasons.java
index ba2b1c716d9..cc4d1b7d7a0 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/SuspensionReasons.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/SuspensionReasons.java
@@ -49,7 +49,7 @@ public class SuspensionReasons {
 
     /** An ordered list of all messages, typically useful for testing. */
     public List<String> getMessagesInOrder() {
-        return reasons.values().stream().flatMap(Collection::stream).sorted().collect(Collectors.toList());
+        return reasons.values().stream().flatMap(Collection::stream).sorted().toList();
     }
 
     public SuspensionReasons mergeWith(SuspensionReasons that) {
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HealthRequestHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HealthRequestHandler.java
index 7e157eade1b..079eff4f777 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HealthRequestHandler.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HealthRequestHandler.java
@@ -56,7 +56,7 @@ public class HealthRequestHandler extends RestApiRequestHandler<HealthRequestHan
                     .withPath(Path.parse("/orchestrator/v1/health/" + applicationId.serializedForm()))
                     .toString();
             return reference;
-        }).collect(Collectors.toList());
+        }).toList();
 
         return list;
     }
@@ -75,7 +75,7 @@ public class HealthRequestHandler extends RestApiRequestHandler<HealthRequestHan
             return serviceResource;
         })
                 .sorted(Comparator.comparing(resource -> resource.serviceType.s()))
-                .collect(Collectors.toList());
+                .toList();
 
         ApplicationServices applicationServices = new ApplicationServices();
         applicationServices.services = serviceResources;
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandler.java
index 44a095bbc64..3119c425d5f 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandler.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandler.java
@@ -82,7 +82,7 @@ public class HostRequestHandler extends RestApiRequestHandler<HostRequestHandler
                             serviceInstance.getServiceCluster().serviceType().s(),
                             serviceInstance.configId().s(),
                             serviceInstance.serviceStatus().name()))
-                    .collect(Collectors.toList());
+                    .toList();
 
             return new GetHostResponse(
                     host.getHostName().s(),
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandler.java
index f1d7ae3857c..205fea4dfcf 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandler.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandler.java
@@ -50,7 +50,7 @@ public class HostSuspensionRequestHandler extends RestApiRequestHandler<HostSusp
         List<String> hostnamesAsStrings = context.queryParameters().getStringList("hostname");
 
         HostName parentHostname = new HostName(parentHostnameString);
-        List<HostName> hostnames = hostnamesAsStrings.stream().map(HostName::new).collect(Collectors.toList());
+        List<HostName> hostnames = hostnamesAsStrings.stream().map(HostName::new).toList();
         try {
             orchestrator.suspendAll(parentHostname, hostnames);
         } catch (BatchHostStateChangeDeniedException e) {
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java
index 16f55d9ec9b..0964a3f7dd5 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java
@@ -90,7 +90,7 @@ public class InstanceRequestHandler extends RestApiRequestHandler<InstanceReques
     }
 
     private List<ApplicationInstanceReference> getAllInstances(RestApi.RequestContext context) {
-        return serviceMonitor.getAllApplicationInstanceReferences().stream().sorted().collect(Collectors.toList());
+        return serviceMonitor.getAllApplicationInstanceReferences().stream().sorted().toList();
     }
 
     private InstanceStatusResponse getInstance(RestApi.RequestContext context) {
@@ -132,7 +132,7 @@ public class InstanceRequestHandler extends RestApiRequestHandler<InstanceReques
         List<Mirror.Entry> entries = slobrokApi.lookup(applicationId, pattern);
         return entries.stream()
                 .map(entry -> new SlobrokEntryResponse(entry.getName(), entry.getSpecString()))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private ServiceStatusInfo getServiceStatus(RestApi.RequestContext context) {
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java
index a3054703b61..b48fb75e781 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java
@@ -155,7 +155,7 @@ public class ApplicationApiImplTest {
         try (scopedApi) {
             List<HostName> upStorageNodes = scopedApi.applicationApi().getNoRemarksStorageNodesInGroupInClusterOrder().stream()
                     .map(storageNode -> storageNode.hostName())
-                    .collect(Collectors.toList());
+                    .toList();
             assertEquals(Arrays.asList(expectedHostNames), upStorageNodes);
         }
     }
@@ -192,7 +192,7 @@ public class ApplicationApiImplTest {
                     .getNoRemarksStorageNodesInGroupInClusterOrder()
                     .stream()
                     .map(storageNode -> storageNode.hostName())
-                    .collect(Collectors.toList());
+                    .toList();
             assertEquals(upStorageNodes, actualStorageNodes);
         }
     }
@@ -344,7 +344,7 @@ public class ApplicationApiImplTest {
                     .getSuspendedStorageNodesInGroupInReverseClusterOrder()
                     .stream()
                     .map(storageNode -> storageNode.hostName())
-                    .collect(Collectors.toList());
+                    .toList();
             assertEquals(Arrays.asList(hostNames), actualStorageNodes);
         }
     }
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java
index 1563a54a029..b073f546cce 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java
@@ -126,7 +126,7 @@ public class ClusterApiImplTest {
 
         var hostnames = IntStream.rangeClosed(1, serviceStatusList.size())
                                  .mapToObj(i -> new HostName("cfg" + i))
-                                 .collect(Collectors.toList());
+                                 .toList();
         var instances = new ArrayList<ServiceInstance>();
         for (int i = 0; i < hostnames.size(); i++) {
             instances.add(modelUtils.createServiceInstance("cs" + i + 1, hostnames.get(i), serviceStatusList.get(i)));
@@ -371,7 +371,7 @@ public class ClusterApiImplTest {
         serviceStatusList.addAll(List.of(rest));
         var hostnames = IntStream.rangeClosed(1, serviceStatusList.size())
                                  .mapToObj(i -> new HostName("cfg" + i))
-                                 .collect(Collectors.toList());
+                                 .toList();
         var instances = new ArrayList<ServiceInstance>();
         for (int i = 0; i < hostnames.size(); i++) {
             instances.add(modelUtils.createServiceInstance("cs" + i + 1, hostnames.get(i), serviceStatusList.get(i)));
diff --git a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java
index 8db2387bf66..de3207fda2e 100644
--- a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java
+++ b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingTable.java
@@ -103,7 +103,7 @@ public class RoutingTable {
                                                                                    4443,
                                                                                    configuredEndpoint.weight(),
                                                                                    applications.getValue().activeRotation()))
-                                                         .collect(Collectors.toList());
+                                                         .toList();
                     Endpoint endpoint = new Endpoint(configuredEndpoint.dnsName(), routingMethodFrom(configuredEndpoint));
                     ClusterSpec.Id cluster = ClusterSpec.Id.from(configuredEndpoint.clusterId());
                     Target target;
diff --git a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java
index 0b17daa3e3c..fb21d153ded 100644
--- a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java
+++ b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/nginx/NginxTest.java
@@ -146,7 +146,7 @@ public class NginxTest {
             List<String> rotatedFiles = Exceptions.uncheck(() -> Files.list(NginxPath.root.in(fileSystem))
                                                                       .map(path -> path.getFileName().toString())
                                                                       .filter(filename -> filename.contains(".conf-"))
-                                                                      .collect(Collectors.toList()));
+                                                                      .toList());
             assertEquals(List.of(expectedRotatedFiles), rotatedFiles);
             return this;
         }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java
index 4ff3b342a20..3054f53e7b3 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java
@@ -51,7 +51,7 @@ public class Group extends Identifiable {
             if (list.size() == 2) {
                 return (cmp.compare(list.get(0), list.get(1)) > 0) ? List.of(list.get(1), list.get(0)) : list;
             }
-            return list.stream().sorted(cmp).collect(Collectors.toList());
+            return list.stream().sorted(cmp).toList();
         }
     }
 
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
index eccffa27930..e82e2cc0265 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
@@ -94,7 +94,7 @@ public abstract class InfraApplication implements InfraApplicationApi {
     }
 
     public ApplicationInfo makeApplicationInfo(List<HostName> hostnames) {
-        List<HostInfo> hostInfos = hostnames.stream().map(this::makeHostInfo).collect(Collectors.toList());
+        List<HostInfo> hostInfos = hostnames.stream().map(this::makeHostInfo).toList();
         return new ApplicationInfo(application.id(), 0, new HostsModel(hostInfos));
     }
 
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java
index d02cad1c068..6cf7d4d9f26 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java
@@ -64,7 +64,7 @@ public class DuperModelManagerTest {
         makeManager(false);
 
         ApplicationId id = proxyHostApplication.getApplicationId();
-        List<HostName> proxyHostHosts = Stream.of("proxyhost1", "proxyhost2").map(HostName::of).collect(Collectors.toList());
+        List<HostName> proxyHostHosts = Stream.of("proxyhost1", "proxyhost2").map(HostName::of).toList();
         verify(duperModel, times(0)).add(any());
         manager.infraApplicationActivated(id, proxyHostHosts);
         verify(duperModel, times(1)).add(any());
@@ -91,12 +91,12 @@ public class DuperModelManagerTest {
     }
 
     private void testEnabledConfigServerLikeInfraApplication(ApplicationId firstId, ApplicationId secondId) {
-        List<HostName> hostnames1 = Stream.of("node11", "node12").map(HostName::of).collect(Collectors.toList());
+        List<HostName> hostnames1 = Stream.of("node11", "node12").map(HostName::of).toList();
         manager.infraApplicationActivated(firstId, hostnames1);
         verify(duperModel, times(1)).add(any());
 
         // Adding the second config server like application will be ignored
-        List<HostName> hostnames2 = Stream.of("node21", "node22").map(HostName::of).collect(Collectors.toList());
+        List<HostName> hostnames2 = Stream.of("node21", "node22").map(HostName::of).toList();
         assertThrows(IllegalArgumentException.class, () -> manager.infraApplicationActivated(secondId, hostnames2));
         verify(duperModel, times(1)).add(any());
 
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java
index 69d3ef4d498..73a49ca8717 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java
@@ -57,7 +57,7 @@ public class DuperModelTest {
 
         List<HostInfo> hostInfos = Arrays.stream(hostnames)
                 .map(hostname -> new HostInfo(hostname.value(), List.of()))
-                .collect(Collectors.toList());
+                .toList();
         when(model.getHosts()).thenReturn(hostInfos);
     }
 
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java
index c77ff519abd..f7ee64b52a6 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java
@@ -48,7 +48,7 @@ public class HealthMonitorManagerTest {
     public void infrastructureApplication() {
         ProxyHostApplication proxyHostApplication = new ProxyHostApplication();
         when(duperModel.isSupportedInfraApplication(proxyHostApplication.getApplicationId())).thenReturn(true);
-        List<HostName> hostnames = Stream.of("proxyhost1", "proxyhost2").map(HostName::of).collect(Collectors.toList());
+        List<HostName> hostnames = Stream.of("proxyhost1", "proxyhost2").map(HostName::of).toList();
         ApplicationInfo proxyHostApplicationInfo = proxyHostApplication.makeApplicationInfo(hostnames);
 
         manager.applicationActivated(proxyHostApplicationInfo);
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java
index 8ae0e55fe41..18b56f76e88 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/StateV1HealthModelTest.java
@@ -38,7 +38,7 @@ public class StateV1HealthModelTest {
     private final Duration requestTimeout = Duration.ofSeconds(2);
     private final Duration keepAlive = Duration.ofSeconds(3);
     private final ProxyHostApplication proxyHostApplication = new ProxyHostApplication();
-    private final List<HostName> hostnames = Stream.of("host1", "host2").map(HostName::of).collect(Collectors.toList());
+    private final List<HostName> hostnames = Stream.of("host1", "host2").map(HostName::of).toList();
     private final ApplicationInfo proxyHostApplicationInfo = proxyHostApplication.makeApplicationInfo(hostnames);
 
     private final StateV1HealthModel model = new StateV1HealthModel(healthStaleness, requestTimeout, keepAlive, executor);
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java
index 8f87a7bad68..a2532590f52 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ApplicationInstanceGeneratorTest.java
@@ -34,7 +34,7 @@ public class ApplicationInstanceGeneratorTest {
         when(statusProvider.getStatus(any(), any(), any(), any())).thenReturn(new ServiceStatusInfo(ServiceStatus.NOT_CHECKED));
         Zone zone = mock(Zone.class);
         ApplicationInfo configServer = configServerApplication.makeApplicationInfo(
-                configServerList.stream().map(HostName::of).collect(Collectors.toList()));
+                configServerList.stream().map(HostName::of).toList());
         ApplicationInstance applicationInstance = new ApplicationInstanceGenerator(configServer, zone)
                 .makeApplicationInstance(statusProvider);
 
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java
index 508c98d1292..8e1f2349046 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModel.java
@@ -35,7 +35,7 @@ public class ExampleModel {
     public static final ApplicationId APPLICATION_ID = ApplicationId.from(TENANT, APPLICATION_NAME, INSTANCE_NAME);
 
     public static SuperModel createExampleSuperModelWithOneRpcPort(String hostname, int rpcPort) {
-        List<String> hosts = Stream.of(hostname).collect(Collectors.toList());
+        List<String> hosts = Stream.of(hostname).toList();
 
         ApplicationInfo applicationInfo = ExampleModel
                 .createApplication(TENANT, APPLICATION_NAME)
@@ -83,7 +83,7 @@ public class ExampleModel {
             List<String> allHosts = clusters.stream()
                     .flatMap(clusterBuilder -> clusterBuilder.hosts.stream())
                     .distinct()
-                    .collect(Collectors.toList());
+                    .toList();
 
             List<HostInfo> hostInfos = new ArrayList<>();
             for (String hostname : allHosts) {
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModelTest.java
index b66c6968764..829b1fe5859 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModelTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ExampleModelTest.java
@@ -30,8 +30,8 @@ public class ExampleModelTest {
 
     @Test
     public void test() {
-        List<String> contentNodes = Stream.of("host1", "host2").collect(Collectors.toList());
-        List<String> containerNodes = Stream.of("host3", "host4").collect(Collectors.toList());
+        List<String> contentNodes = Stream.of("host1", "host2").toList();
+        List<String> containerNodes = Stream.of("host3", "host4").toList();
 
         ApplicationInfo application = ExampleModel
                 .createApplication(
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java
index 97b6ff0c3e2..c93e4dfb7fe 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java
@@ -142,7 +142,7 @@ public class ServiceHostListenerAdapterTest {
 
         List<HostInfo> hostnameList = Stream.of(hostnames)
                 .map(hostname -> new HostInfo(hostname, List.of()))
-                .collect(Collectors.toList());
+                .toList();
         when(model.getHosts()).thenReturn(hostnameList);
 
         return applicationInfo;
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceMonitorImplTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceMonitorImplTest.java
index c98e9ae2b18..c3f805b0572 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceMonitorImplTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceMonitorImplTest.java
@@ -31,7 +31,7 @@ public class ServiceMonitorImplTest {
         ApplicationInfo application1 = mock(ApplicationInfo.class);
         ApplicationInfo application2 = mock(ApplicationInfo.class);
         List<ApplicationInfo> applications = Stream.of(application1, application2)
-                .collect(Collectors.toList());
+                .toList();
         when(duperModelManager.getApplicationInfos()).thenReturn(applications);
 
         ServiceModel serviceModel = serviceMonitor.getServiceModelSnapshot();
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java
index df489a8c336..498a9dfc15e 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java
@@ -37,7 +37,7 @@ public class ConfigserverUtil {
             String configServerHostname3) {
         return new ConfigServerApplication().makeApplicationInfo(
                 Stream.of(configServerHostname1, configServerHostname2, configServerHostname3)
-                      .map(HostName::of).collect(Collectors.toList()));
+                      .map(HostName::of).toList());
     }
 
     public static ApplicationInfo makeExampleConfigServer() {
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java b/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java
index f755d988f28..c2f16f3e1b4 100644
--- a/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java
+++ b/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java
@@ -68,7 +68,7 @@ public class LocalFileDb implements FileAcquirer, FileRegistry {
     @Override
     public List<Entry> export() {
         return fileReferenceToFile.entrySet().stream().map(entry -> new Entry(entry.getValue().getPath(), entry.getKey()))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java
index f80cdbed900..d26a70ea8bf 100644
--- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java
+++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java
@@ -309,7 +309,7 @@ public class StandaloneContainerApplication implements Application {
             throw new RuntimeException("No jdisc element found under services.");
         } else {
             List<String> nameAndId = jDiscElements.stream().map(e -> e.getNodeName() + " id='" + e.getAttribute("id") + "'")
-                    .collect(Collectors.toList());
+                    .toList();
             throw new RuntimeException("Found multiple JDisc elements: " + String.join(", ", nameAndId));
         }
     }
diff --git a/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java b/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java
index 3bb42879960..cdb0bffc3f9 100644
--- a/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java
+++ b/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java
@@ -38,7 +38,7 @@ public class CloudConfigInstallVariablesTest {
         CloudConfigOptions.ConfigServer[] parsed = toConfigServers("test1     test2");
         assertEquals(2, parsed.length);
 
-        List<String> hostNames = Arrays.stream(parsed).map(cs -> cs.hostName).collect(Collectors.toList());
+        List<String> hostNames = Arrays.stream(parsed).map(cs -> cs.hostName).toList();
         assertTrue(hostNames.containsAll(Arrays.asList("test1", "test2")));
     }
 
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java
index 7d38dfda7fb..2ff59b5746f 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzAccessToken.java
@@ -52,7 +52,7 @@ public class AthenzAccessToken {
         String domain = Optional.ofNullable(jwt().getClaim(AUDIENCE_CLAIM).asString()).orElse("");
         return Optional.ofNullable(jwt().getClaim(SCOPE_CLAIM).asList(String.class)).orElse(List.of()).stream()
                 .map(role -> new AthenzRole(domain, role))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private DecodedJWT jwt() {
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java
index dcc3452a69a..b4431424952 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzRoleInformation.java
@@ -53,7 +53,7 @@ public class AthenzRoleInformation extends AthenzRole {
         var auditLog = roleEntity.auditLog()
                 .stream()
                 .map(entry -> new AuditLogEntry(entry.getAdmin(), entry.getAction(), entry.getAuditRef(), entry.getCreated()))
-                .collect(Collectors.toList());
+                .toList();
         return new AthenzRoleInformation(role.domain(), role.roleName(), isSelfServe, reviewEnabled, pendingRequest, auditLog);
     }
 
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java
index aaf9038208f..7b3388d1027 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java
@@ -346,7 +346,7 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient {
                 .filter(member -> ! member.pendingApproval())
                 .map(RoleEntity.Member::memberName)
                 .map(AthenzIdentities::from)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -356,7 +356,7 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient {
 
         return execute.services.stream()
                 .map(serviceName -> new AthenzService(athenzDomain, serviceName))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java
index 7c48e8239d5..b32e2bec7a9 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/AccessTokenResponseEntity.java
@@ -32,7 +32,7 @@ public class AccessTokenResponseEntity {
         this.roles = Stream.of(roles.split(" "))
                 .map(AthenzResourceName::fromString)
                 .map(AthenzRole::fromResourceName)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public AthenzAccessToken accessToken() {
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
index 52ce860bfce..93574339c5a 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java
@@ -253,7 +253,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen
         try {
             List<AthenzRole> roleList = roles.stream()
                     .map(roleName -> new AthenzRole(domain, roleName))
-                    .collect(Collectors.toList());
+                    .toList();
             return roleSpecificAccessTokenCache.get(roleList).value();
         } catch (Exception e) {
             throw new AthenzIdentityProviderException("Could not retrieve access token: " + e.getMessage(), e);
diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java
index 4d50d323222..7ba658481d9 100644
--- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java
+++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestRunner.java
@@ -187,7 +187,7 @@ public class TestRunner implements com.yahoo.vespa.testrunner.TestRunner {
             return element
                     .filter(Files::isRegularFile)
                     .filter(path -> path.toString().endsWith(".jar"))
-                    .collect(Collectors.toList());
+                    .toList();
         } catch (IOException e) {
             throw new UncheckedIOException("Failed to list files under " + directory, e);
         }
diff --git a/vespajlib/src/main/java/com/yahoo/path/Path.java b/vespajlib/src/main/java/com/yahoo/path/Path.java
index 737a27c57d8..5a835b1059f 100644
--- a/vespajlib/src/main/java/com/yahoo/path/Path.java
+++ b/vespajlib/src/main/java/com/yahoo/path/Path.java
@@ -55,7 +55,7 @@ public final class Path {
      * Add path elements by splitting based on delimiter and appending to elements.
      */
     private static List<String> elementsOf(String path, String delimiter) {
-        return Arrays.stream(path.split(delimiter)).filter(e -> !"".equals(e)).collect(Collectors.toList());
+        return Arrays.stream(path.split(delimiter)).filter(e -> !"".equals(e)).toList();
     }
 
     /**
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
index dfbcb06c365..36693280183 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java
@@ -100,7 +100,7 @@ public class TensorType {
         else if (dimensionList.stream().noneMatch(d -> d.isIndexed()))
             mappedSubtype = this;
         else
-            mappedSubtype = new TensorType(valueType, dimensions.stream().filter(d -> ! d.isIndexed()).collect(Collectors.toList()));
+            mappedSubtype = new TensorType(valueType, dimensions.stream().filter(d -> ! d.isIndexed()).toList());
     }
 
     static public Value combinedValueType(TensorType ... types) {
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java
index 7218375de89..2aee7baa0cc 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java
@@ -23,7 +23,7 @@ public class Diag<NAMETYPE extends Name> extends CompositeTensorFunction<NAMETYP
 
     public Diag(TensorType type) {
         this.type = type;
-        this.diagFunction = ScalarFunctions.equal(dimensionNames().collect(Collectors.toList()));
+        this.diagFunction = ScalarFunctions.equal(dimensionNames().toList());
     }
 
     @Override
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java
index 7053eeb0a1c..ae65dc929bd 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java
@@ -24,7 +24,7 @@ public class Range<NAMETYPE extends Name> extends CompositeTensorFunction<NAMETY
 
     public Range(TensorType type) {
         this.type = type;
-        this.rangeFunction = ScalarFunctions.sum(dimensionNames().collect(Collectors.toList()));
+        this.rangeFunction = ScalarFunctions.sum(dimensionNames().toList());
     }
 
     @Override
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java
index 1048e5ab10e..95987d9b886 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java
@@ -294,7 +294,7 @@ public class ReduceJoin<NAMETYPE extends Name> extends CompositeTensorFunction<N
         if (reducingDimensions.isEmpty()) {
             reducingDimensions = dimensionsInCommon((IndexedTensor)a, (IndexedTensor)b).dimensions().stream()
                     .map(TensorType.Dimension::name)
-                    .collect(Collectors.toList());
+                    .toList();
         }
         if (reducingDimensions.size() != 1) {
             return false;
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
index 39bddc3a3cd..a9a6df6ed4d 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
@@ -116,7 +116,7 @@ public class Slice<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETY
     }
 
     private List<String> findDimensions(List<TensorType.Dimension> dims, Predicate<TensorType.Dimension> pred) {
-        return dims.stream().filter(pred).map(TensorType.Dimension::name).collect(Collectors.toList());
+        return dims.stream().filter(pred).map(TensorType.Dimension::name).toList();
     }
 
     private TensorType resultType(TensorType argumentType) {
@@ -138,7 +138,7 @@ public class Slice<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETY
             }
         }
         else { // general slicing
-            peekDimensions = subspaceAddress.stream().map(d -> d.dimension().get()).collect(Collectors.toList());
+            peekDimensions = subspaceAddress.stream().map(d -> d.dimension().get()).toList();
         }
         try {
             return TypeResolver.peek(argumentType, peekDimensions);
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
index b683519988c..a7afc1efc6d 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
@@ -124,7 +124,7 @@ public class JsonFormat {
 
     private static void encodeBlocks(MixedTensor tensor, Cursor cursor) {
         var mappedDimensions = tensor.type().dimensions().stream().filter(d -> d.isMapped())
-                .map(d -> TensorType.Dimension.mapped(d.name())).collect(Collectors.toList());
+                .map(d -> TensorType.Dimension.mapped(d.name())).toList();
         if (mappedDimensions.size() < 1) {
             throw new IllegalArgumentException("Should be ensured by caller");
         }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java
index 2a55ac658b1..c18e9f179d6 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java
@@ -43,7 +43,7 @@ class MixedBinaryFormat implements BinaryFormat {
     }
 
     private void encodeSparseDimensions(GrowableByteBuffer buffer, MixedTensor tensor) {
-        List<TensorType.Dimension> sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList());
+        List<TensorType.Dimension> sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).toList();
         buffer.putInt1_4Bytes(sparseDimensions.size());
         for (TensorType.Dimension dimension : sparseDimensions) {
             buffer.putUtf8String(dimension.name());
@@ -51,7 +51,7 @@ class MixedBinaryFormat implements BinaryFormat {
     }
 
     private void encodeDenseDimensions(GrowableByteBuffer buffer, MixedTensor tensor) {
-        List<TensorType.Dimension> denseDimensions = tensor.type().dimensions().stream().filter(d -> d.isIndexed()).collect(Collectors.toList());
+        List<TensorType.Dimension> denseDimensions = tensor.type().dimensions().stream().filter(d -> d.isIndexed()).toList();
         buffer.putInt1_4Bytes(denseDimensions.size());
         for (TensorType.Dimension dimension : denseDimensions) {
             buffer.putUtf8String(dimension.name());
@@ -71,7 +71,7 @@ class MixedBinaryFormat implements BinaryFormat {
     }
 
     private void encodeCells(GrowableByteBuffer buffer, MixedTensor tensor, Consumer<Double> consumer) {
-        List<TensorType.Dimension> sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList());
+        List<TensorType.Dimension> sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).toList();
         long denseSubspaceSize = tensor.denseSubspaceSize();
         if (sparseDimensions.size() > 0) {
             buffer.putInt1_4Bytes((int)(tensor.size() / denseSubspaceSize));  // XXX: Size truncation
@@ -137,7 +137,7 @@ class MixedBinaryFormat implements BinaryFormat {
     }
 
     private void decodeCells(GrowableByteBuffer buffer, MixedTensor.BoundBuilder builder, TensorType type, Supplier<Double> supplier) {
-        List<TensorType.Dimension> sparseDimensions = type.dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList());
+        List<TensorType.Dimension> sparseDimensions = type.dimensions().stream().filter(d -> !d.isIndexed()).toList();
         TensorType sparseType = MixedTensor.createPartialType(type.valueType(), sparseDimensions);
         long denseSubspaceSize = builder.denseSubspaceSize();
 
diff --git a/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java b/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java
index 25e6222486c..7b9de25954d 100644
--- a/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java
+++ b/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java
@@ -96,7 +96,7 @@ public final class NestedTransaction implements AutoCloseable {
 
     @Override
     public String toString() {
-        return String.join(",", transactions.stream().map(Object::toString).collect(Collectors.toList()));
+        return String.join(",", transactions.stream().map(Object::toString).toList());
     }
 
     private List<Transaction> organizeTransactions(List<ConstrainedTransaction> transactions) {
@@ -166,7 +166,7 @@ public final class NestedTransaction implements AutoCloseable {
 
     private List<OrderingConstraint> findAllOrderingConstraintsFrom(Class<? extends Transaction> transactionType,
                                                                     List<OrderingConstraint> constraints) {
-        return constraints.stream().filter(c -> c.before().equals(transactionType)).collect(Collectors.toList());
+        return constraints.stream().filter(c -> c.before().equals(transactionType)).toList();
     }
 
     private static class ConstrainedTransaction {
diff --git a/vespajlib/src/test/java/com/yahoo/slime/SlimeStreamTest.java b/vespajlib/src/test/java/com/yahoo/slime/SlimeStreamTest.java
index 333fdeb4903..cb1eafe3de2 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/SlimeStreamTest.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/SlimeStreamTest.java
@@ -12,7 +12,7 @@ public class SlimeStreamTest {
     @Test
     public void test_empty_array() {
         var inspector = new Slime().setArray();
-        var items = SlimeStream.fromArray(inspector, Inspector::asString).collect(Collectors.toList());
+        var items = SlimeStream.fromArray(inspector, Inspector::asString).toList();
         assertEquals(List.of(), items);
     }
 
@@ -21,7 +21,7 @@ public class SlimeStreamTest {
         var inspector = new Slime().setArray();
         inspector.addString("foo");
         inspector.addString("bar");
-        var items = SlimeStream.fromArray(inspector, Inspector::asString).collect(Collectors.toList());
+        var items = SlimeStream.fromArray(inspector, Inspector::asString).toList();
         assertEquals(List.of("foo", "bar"), items);
     }
 }
diff --git a/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java b/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java
index 28930b67264..95a0ef4319e 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/SlimeUtilsTest.java
@@ -107,7 +107,7 @@ public class SlimeUtilsTest {
         assertEquals(0, SlimeUtils.entriesStream(inspector.field("object")).count());
 
         assertEquals(List.of(1L, 2L, 4L, 3L, 0L),
-                     SlimeUtils.entriesStream(inspector.field("list")).map(Inspector::asLong).collect(Collectors.toList()));
+                     SlimeUtils.entriesStream(inspector.field("list")).map(Inspector::asLong).toList());
     }
 
 }
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java
index 013615e4594..a2386c97a84 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorFunctionBenchmark.java
@@ -26,7 +26,7 @@ public class TensorFunctionBenchmark {
         Tensor queryVector = vectors(1, 300, dimensionType).get(0);
         if (extraSpace) {
             queryVector = queryVector.multiply(unitVector("j"));
-            modelVectors = modelVectors.stream().map(t -> t.multiply(unitVector("k"))).collect(Collectors.toList());
+            modelVectors = modelVectors.stream().map(t -> t.multiply(unitVector("k"))).toList();
         }
         dotProduct(queryVector, modelVectors, Math.max(iterations/10, 10)); // warmup
         System.gc();
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java
index 006a7ce575d..0ad4a4b8294 100644
--- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java
+++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java
@@ -154,7 +154,7 @@ public class Configurator {
         return zookeeperServerConfig.server().stream()
                                     .map(ZookeeperServerConfig.Server::hostname)
                                     .distinct()
-                                    .collect(Collectors.toList());
+                                    .toList();
     }
 
     Path makeAbsolutePath(String filename) {
diff --git a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ExponentialBackoffTest.java b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ExponentialBackoffTest.java
index f3328acbacc..3fea8cc52bc 100644
--- a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ExponentialBackoffTest.java
+++ b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ExponentialBackoffTest.java
@@ -26,7 +26,7 @@ public class ExponentialBackoffTest {
                              Duration.ofMillis(4932)),
                      IntStream.rangeClosed(1, 5)
                               .mapToObj(b::delay)
-                              .collect(Collectors.toList()));
+                              .toList());
     }
 
 }