diff --git a/src/main/java/com/gepardec/mega/application/exception/mapper/ConstraintViolationExceptionMapper.java b/src/main/java/com/gepardec/mega/application/exception/mapper/ConstraintViolationExceptionMapper.java
index 8e5ad7b16..daab6a653 100644
--- a/src/main/java/com/gepardec/mega/application/exception/mapper/ConstraintViolationExceptionMapper.java
+++ b/src/main/java/com/gepardec/mega/application/exception/mapper/ConstraintViolationExceptionMapper.java
@@ -41,7 +41,7 @@ private List<ValidationViolation> createResponseEntityForConstraintViolationExce
         }
         return violations.stream()
                 .map(this::createValidationViolationForConstraintViolation)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private ValidationViolation createValidationViolationForConstraintViolation(final ConstraintViolation<?> violation) {
diff --git a/src/main/java/com/gepardec/mega/domain/calculation/journey/InvalidJourneyCalculator.java b/src/main/java/com/gepardec/mega/domain/calculation/journey/InvalidJourneyCalculator.java
index 59c26c42a..e77bbe254 100644
--- a/src/main/java/com/gepardec/mega/domain/calculation/journey/InvalidJourneyCalculator.java
+++ b/src/main/java/com/gepardec/mega/domain/calculation/journey/InvalidJourneyCalculator.java
@@ -21,7 +21,7 @@ public List<JourneyWarning> calculate(List<ProjectEntry> projectTimeEntries) {
                 .filter(entry -> Task.isJourney(entry.getTask()))
                 .map(JourneyTimeEntry.class::cast)
                 .sorted(Comparator.comparing(ProjectEntry::getFromTime).thenComparing(ProjectEntry::getToTime))
-                .collect(Collectors.toList());
+                .toList();
 
         final List<JourneyWarning> warnings = new ArrayList<>();
         final JourneyDirectionValidator journeyDirectionValidator = new JourneyDirectionValidator();
diff --git a/src/main/java/com/gepardec/mega/domain/calculation/journey/InvalidWorkingLocationInJourneyCalculator.java b/src/main/java/com/gepardec/mega/domain/calculation/journey/InvalidWorkingLocationInJourneyCalculator.java
index 17dfb8d0f..094b0a44b 100644
--- a/src/main/java/com/gepardec/mega/domain/calculation/journey/InvalidWorkingLocationInJourneyCalculator.java
+++ b/src/main/java/com/gepardec/mega/domain/calculation/journey/InvalidWorkingLocationInJourneyCalculator.java
@@ -25,7 +25,7 @@ public class InvalidWorkingLocationInJourneyCalculator implements WarningCalcula
     public List<JourneyWarning> calculate(List<ProjectEntry> projectTimeEntries) {
         final List<ProjectEntry> groupedProjectTimeEntries = projectTimeEntries.stream()
                 .sorted(Comparator.comparing(ProjectEntry::getFromTime).thenComparing(ProjectEntry::getToTime))
-                .collect(Collectors.toList());
+                .toList();
 
         final List<JourneyWarning> warnings = new ArrayList<>();
 
diff --git a/src/main/java/com/gepardec/mega/domain/calculation/time/DoctorAppointmentCalculator.java b/src/main/java/com/gepardec/mega/domain/calculation/time/DoctorAppointmentCalculator.java
index 4bb860571..a9d612751 100644
--- a/src/main/java/com/gepardec/mega/domain/calculation/time/DoctorAppointmentCalculator.java
+++ b/src/main/java/com/gepardec/mega/domain/calculation/time/DoctorAppointmentCalculator.java
@@ -26,7 +26,7 @@ public List<TimeWarning> calculate(List<ProjectEntry> projectEntries) {
         final List<ProjectTimeEntry> projectTimeEntries = projectEntries.stream()
                 .filter(projectEntry -> projectEntry.getClass() == ProjectTimeEntry.class)
                 .map(ProjectTimeEntry.class::cast)
-                .collect(Collectors.toList());
+                .toList();
 
 
         LocalTime projectEntryFromTime, projectEntryToTime;
diff --git a/src/main/java/com/gepardec/mega/domain/calculation/time/InsufficientRestCalculator.java b/src/main/java/com/gepardec/mega/domain/calculation/time/InsufficientRestCalculator.java
index 613f0768d..b2a345057 100644
--- a/src/main/java/com/gepardec/mega/domain/calculation/time/InsufficientRestCalculator.java
+++ b/src/main/java/com/gepardec/mega/domain/calculation/time/InsufficientRestCalculator.java
@@ -59,7 +59,7 @@ private List<ProjectEntry> filterForTaskAndSortByFromDate(final List<ProjectEntr
         return projectTimeEntries.stream()
                 .filter(filterTask.or(filterActiveTravelTime))
                 .sorted(Comparator.comparing(ProjectEntry::getFromTime).thenComparing(ProjectEntry::getToTime))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private ProjectEntry getNextEntryOrNull(final int idx, final List<ProjectEntry> projectTimeEntries) {
diff --git a/src/main/java/com/gepardec/mega/domain/calculation/time/NoEntryCalculator.java b/src/main/java/com/gepardec/mega/domain/calculation/time/NoEntryCalculator.java
index d1efdb1b6..7c56916fc 100644
--- a/src/main/java/com/gepardec/mega/domain/calculation/time/NoEntryCalculator.java
+++ b/src/main/java/com/gepardec/mega/domain/calculation/time/NoEntryCalculator.java
@@ -56,7 +56,7 @@ public List<TimeWarning> calculate(@NotNull Employee employee, @NotNull List<Pro
         List<LocalDate> nonPaidVacationDays = filterAbsenceTypesAndCompileLocalDateList(AbsenteeType.NON_PAID_VACATION_DAYS.getType(), absenceEntries);
         List<LocalDate> bookedDays = projectEntries.stream()
                 .map(ProjectEntry::getDate)
-                .collect(Collectors.toList());
+                .toList();
 
         return businessDays.stream()
                 .filter(date -> !compensatoryDays.contains(date))
@@ -75,7 +75,7 @@ public List<TimeWarning> calculate(@NotNull Employee employee, @NotNull List<Pro
                 .filter(date -> !futureDays.contains(date))
                 .map(this::createTimeWarning)
                 .distinct()
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<LocalDate> getBusinessDaysOfMonth(int year, int month) {
@@ -108,7 +108,7 @@ private List<LocalDate> getRegularWorkingHours0Dates(Employee employee, int year
     private List<LocalDate> getFutureDays() {
         LocalDate today = LocalDate.now();
         return today.datesUntil(today.with(TemporalAdjusters.firstDayOfNextMonth()))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private TimeWarning createTimeWarning(final LocalDate date) {
@@ -123,7 +123,7 @@ private List<LocalDate> filterAbsenceTypesAndCompileLocalDateList(String type, L
         return absenceEntries.stream()
                 .filter(fzt -> fzt.reason().equals(type))
                 .flatMap(this::extractFehlzeitenDateRange)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Stream<LocalDate> extractFehlzeitenDateRange(AbsenceTime fzt) {
diff --git a/src/main/java/com/gepardec/mega/domain/calculation/time/WeekendCalculator.java b/src/main/java/com/gepardec/mega/domain/calculation/time/WeekendCalculator.java
index 594bb58bc..3e4e5a191 100644
--- a/src/main/java/com/gepardec/mega/domain/calculation/time/WeekendCalculator.java
+++ b/src/main/java/com/gepardec/mega/domain/calculation/time/WeekendCalculator.java
@@ -48,7 +48,7 @@ private List<LocalDate> getWeekEndDays(LocalDate startDate, LocalDate endDate) {
         endDate = endDate.plusDays(1);
         return startDate.datesUntil(endDate)
                 .filter(isWeekend)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private boolean isWeekEndDay(LocalDate date, List<LocalDate> listOfWeekendDays) {
diff --git a/src/main/java/com/gepardec/mega/domain/mapper/EntityMapper.java b/src/main/java/com/gepardec/mega/domain/mapper/EntityMapper.java
index 01cc5a904..95fe7b9a1 100644
--- a/src/main/java/com/gepardec/mega/domain/mapper/EntityMapper.java
+++ b/src/main/java/com/gepardec/mega/domain/mapper/EntityMapper.java
@@ -13,12 +13,12 @@ public interface EntityMapper<D, E> {
     default List<E> mapListToEntity(List<D> objects) {
         return objects.stream()
                 .map(this::mapToEntity)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     default List<D> mapListToDomain(List<E> objects) {
         return objects.stream()
                 .map(this::mapToDomain)
-                .collect(Collectors.toList());
+                .toList();
     }
 }
diff --git a/src/main/java/com/gepardec/mega/notification/mail/dates/OfficeCalendarUtil.java b/src/main/java/com/gepardec/mega/notification/mail/dates/OfficeCalendarUtil.java
index 5da5f6ca6..c6e237792 100644
--- a/src/main/java/com/gepardec/mega/notification/mail/dates/OfficeCalendarUtil.java
+++ b/src/main/java/com/gepardec/mega/notification/mail/dates/OfficeCalendarUtil.java
@@ -22,7 +22,7 @@ public class OfficeCalendarUtil {
     public static List<LocalDate> getWorkingDaysBetween(LocalDate startDate, LocalDate endDateInclusive) {
         return startDate.datesUntil(endDateInclusive.plusDays(1))
                 .filter(isWeekend.or(isHoliday).negate())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public static boolean isHoliday(LocalDate date) {
diff --git a/src/main/java/com/gepardec/mega/rest/impl/ManagementResourceImpl.java b/src/main/java/com/gepardec/mega/rest/impl/ManagementResourceImpl.java
index 1ed0c1bd0..a25ec19d1 100644
--- a/src/main/java/com/gepardec/mega/rest/impl/ManagementResourceImpl.java
+++ b/src/main/java/com/gepardec/mega/rest/impl/ManagementResourceImpl.java
@@ -156,11 +156,11 @@ private ProjectManagementEntryDto loadProjectManagementEntryDto(ProjectEmployees
 
             Duration billable = calculateProjectDuration(entries.stream()
                     .map(ManagementEntryDto::getBillableTime)
-                    .collect(Collectors.toList()));
+                    .toList());
 
             Duration nonBillable = calculateProjectDuration(entries.stream()
                     .map(ManagementEntryDto::getNonBillableTime)
-                    .collect(Collectors.toList()));
+                    .toList());
 
             // it is guaranteed that the same Project instance is obtained for every ProjectEntry
             Integer zepId = Optional.ofNullable(projectEntries.get(0))
@@ -221,7 +221,7 @@ public Response getProjectsWithoutLeads() {
                         .comment("Dieses Projekt hat keinen Projektleiter zugewiesen. Bitte in ZEP hinzufügen!")
                         .zepId(project.getZepId())
                         .build())
-                .collect(Collectors.toList());
+                .toList();
 
         return Response.ok(customerProjectsWithoutLeadsDto).build();
     }
@@ -380,7 +380,7 @@ private com.gepardec.mega.domain.model.State extractStateForProject(List<StepEnt
                     }
                 })
                 .map(StepEntry::getState)
-                .collect(Collectors.toList());
+                .toList();
 
         if (projectStateLogicSingle) {
             return collectedStates.stream()
diff --git a/src/main/java/com/gepardec/mega/rest/mapper/DtoMapper.java b/src/main/java/com/gepardec/mega/rest/mapper/DtoMapper.java
index 1e6b0d45e..b41a04090 100644
--- a/src/main/java/com/gepardec/mega/rest/mapper/DtoMapper.java
+++ b/src/main/java/com/gepardec/mega/rest/mapper/DtoMapper.java
@@ -13,12 +13,12 @@ public interface DtoMapper<D, T> {
     default List<T> mapListToDto(List<D> objects) {
         return objects.stream()
                 .map(this::mapToDto)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     default List<D> mapListToDomain(List<T> objects) {
         return objects.stream()
                 .map(this::mapToDomain)
-                .collect(Collectors.toList());
+                .toList();
     }
 }
diff --git a/src/main/java/com/gepardec/mega/service/helper/WorkingTimeUtil.java b/src/main/java/com/gepardec/mega/service/helper/WorkingTimeUtil.java
index be0fb4450..d4372c6a1 100644
--- a/src/main/java/com/gepardec/mega/service/helper/WorkingTimeUtil.java
+++ b/src/main/java/com/gepardec/mega/service/helper/WorkingTimeUtil.java
@@ -67,7 +67,7 @@ public double getOvertimeForEmployee(Employee employee,
         // In case there are absences that do not affect the current month, filter them out
         fehlzeitTypeList = fehlzeitTypeList.stream()
                 .filter(ftl -> ftl.fromDate().getMonthValue() == date.getMonthValue())
-                .collect(Collectors.toList());
+                .toList();
 
         //FIXME
         var workingDaysCountMap = getWorkingDaysBetween(date, DateUtils.getLastDayOfCurrentMonth(date.toString()))
diff --git a/src/main/java/com/gepardec/mega/service/impl/CommentServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/CommentServiceImpl.java
index b8d5423af..75922733e 100644
--- a/src/main/java/com/gepardec/mega/service/impl/CommentServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/CommentServiceImpl.java
@@ -51,7 +51,7 @@ public List<Comment> findCommentsForEmployee(final String employeeEmail,
                 )
                 .stream()
                 .map(commentMapper::mapToDomain)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/src/main/java/com/gepardec/mega/service/impl/EmployeeServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/EmployeeServiceImpl.java
index 059ca5088..df3837344 100644
--- a/src/main/java/com/gepardec/mega/service/impl/EmployeeServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/EmployeeServiceImpl.java
@@ -57,7 +57,7 @@ public List<Employee> getAllActiveEmployees() {
         return zepService.getEmployees().stream()
                 .filter(Employee::isActive)
                 .filter(employee -> Objects.nonNull(employee.getEmail()))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -65,7 +65,7 @@ public List<Employee> getAllEmployeesConsideringExitDate(YearMonth selectedYearM
         return zepService.getEmployees().stream()
                 .filter(checkEmployeeExitDate(selectedYearMonth))
                 .filter(employee -> Objects.nonNull(employee.getEmail()))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -123,7 +123,7 @@ private Function<Employee, CompletableFuture<Object>> asyncUpdateEmployeeRelease
     }
 
     private List<String> getUserIds(final List<Employee> employees) {
-        return employees.stream().map(Employee::getUserId).collect(Collectors.toList());
+        return employees.stream().map(Employee::getUserId).toList();
     }
 
     private Predicate<? super Employee> checkEmployeeExitDate(YearMonth selectedYearMonth) {
diff --git a/src/main/java/com/gepardec/mega/service/impl/MonthlyReportServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/MonthlyReportServiceImpl.java
index 69b5c095c..b7c05e7f6 100644
--- a/src/main/java/com/gepardec/mega/service/impl/MonthlyReportServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/MonthlyReportServiceImpl.java
@@ -175,7 +175,7 @@ private MonthlyReport buildMonthlyReport(
                 .orElse(Collections.emptyList())
                 .stream()
                 .map(PmProgressDto::ofStepEntry)
-                .collect(Collectors.toList());
+                .toList();
 
         List<MappedTimeWarningDTO> mappedTimeWarnings = timeWarningMapper.map(timeWarnings);
         var prematureEmployeeCheck = prematureEmployeeCheckService.findByEmailAndMonth(employee.getEmail(), date);
diff --git a/src/main/java/com/gepardec/mega/service/impl/PrematureEmployeeCheckSyncServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/PrematureEmployeeCheckSyncServiceImpl.java
index 54b2960fb..715d8862f 100644
--- a/src/main/java/com/gepardec/mega/service/impl/PrematureEmployeeCheckSyncServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/PrematureEmployeeCheckSyncServiceImpl.java
@@ -39,7 +39,7 @@ public boolean syncPrematureEmployeeChecksWithStepEntries(YearMonth yearMonth) {
         List<PrematureEmployeeCheck> prematureEmployeeCheckEntities = prematureEmployeeCheckService.findAllForMonth(selectedMonth)
                 .stream()
                 .filter(pec -> pec.getState().equals(PrematureEmployeeCheckState.DONE) || pec.getState().equals(PrematureEmployeeCheckState.IN_PROGRESS))
-                .collect(Collectors.toList());
+                .toList();
 
         logger.info(
                 String.format("Syncing %s PrematureEmployeeChecks with StepEntries for Month: %s",
diff --git a/src/main/java/com/gepardec/mega/service/impl/ProjectCommentServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/ProjectCommentServiceImpl.java
index 4c41da95b..84a25bcf5 100644
--- a/src/main/java/com/gepardec/mega/service/impl/ProjectCommentServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/ProjectCommentServiceImpl.java
@@ -32,7 +32,7 @@ public class ProjectCommentServiceImpl implements ProjectCommentService {
     @Override
     public List<ProjectCommentDto> findForProjectNameInRange(String projectName, LocalDate from, LocalDate to) {
         List<ProjectComment> entities = projectCommentRepository.findByProjectNameAndDateBetween(projectName, from, to);
-        return entities.stream().map(e -> projectCommentMapper.mapToDto(e)).collect(Collectors.toList());
+        return entities.stream().map(e -> projectCommentMapper.mapToDto(e)).toList();
     }
 
     @Override
diff --git a/src/main/java/com/gepardec/mega/service/impl/ProjectServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/ProjectServiceImpl.java
index 22e54c8f2..f7061ef92 100644
--- a/src/main/java/com/gepardec/mega/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/ProjectServiceImpl.java
@@ -43,7 +43,7 @@ public List<Project> getProjectsForMonthYear(final LocalDate monthYear, final Li
         return zepService.getProjectsForMonthYear(monthYear)
                 .stream()
                 .filter(project -> filterProject(project, Optional.ofNullable(projectFilters).orElse(List.of())))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/src/main/java/com/gepardec/mega/service/impl/ProjectSyncServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/ProjectSyncServiceImpl.java
index f78bd6306..7de7c1068 100644
--- a/src/main/java/com/gepardec/mega/service/impl/ProjectSyncServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/ProjectSyncServiceImpl.java
@@ -86,7 +86,7 @@ private List<com.gepardec.mega.db.entity.project.Project> createProjects(List<Us
                 .map(project -> createProjectEntityFromProject(activeUsers, project, date))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Optional<com.gepardec.mega.db.entity.project.Project> createProjectEntityFromProject(List<User> activeUsers, Project project, LocalDate date) {
@@ -99,7 +99,7 @@ private Optional<com.gepardec.mega.db.entity.project.Project> createProjectEntit
                 .map(userid -> findUserByUserId(activeUsers, userid))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .collect(Collectors.toList());
+                .toList();
 
         if (leads.isEmpty()) {
             return Optional.empty();
diff --git a/src/main/java/com/gepardec/mega/service/impl/StepEntryServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/StepEntryServiceImpl.java
index 6becd397b..c7cf92a48 100644
--- a/src/main/java/com/gepardec/mega/service/impl/StepEntryServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/StepEntryServiceImpl.java
@@ -197,7 +197,7 @@ public List<ProjectEmployees> getProjectEmployeesForPM(final LocalDate from, fin
                 .entrySet()
                 .stream()
                 .map(e -> ProjectEmployees.builder().projectId(e.getKey()).employees(e.getValue()).build())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -213,7 +213,7 @@ public List<ProjectEmployees> getAllProjectEmployeesForPM(LocalDate from, LocalD
                 .entrySet()
                 .stream()
                 .map(e -> ProjectEmployees.builder().projectId(e.getKey()).employees(e.getValue()).build())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/src/main/java/com/gepardec/mega/service/impl/StepEntrySyncServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/StepEntrySyncServiceImpl.java
index b1247c633..0e7f7de3e 100644
--- a/src/main/java/com/gepardec/mega/service/impl/StepEntrySyncServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/StepEntrySyncServiceImpl.java
@@ -85,7 +85,7 @@ private boolean generateStepEntries(LocalDate date) {
                 .map(email -> findUserByEmail(activeUsers, email))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
-                .collect(Collectors.toList());
+                .toList();
 
         logger.info("Loaded projects: {}", projectsForMonthYear.size());
         logger.debug("projects are {}", projectsForMonthYear);
@@ -121,7 +121,7 @@ private boolean generateStepEntries(LocalDate date) {
             toBeCreatedFilteredStepEntries = toBeCreatedStepEntries.stream()
                     .filter(stepEntry -> allEntityStepEntries.stream()
                             .noneMatch(stepEntry1 -> modelEqualsEntityStepEntry(stepEntry, stepEntry1)))
-                    .collect(Collectors.toList());
+                    .toList();
         }
 
 
@@ -149,7 +149,7 @@ private List<StepEntry> createStepEntriesProjectLeadForUsers(final LocalDate dat
         return users.stream()
                 .map(owner -> createStepEntriesForOwnerProjects(date, step, projects, users, owner))
                 .flatMap(Collection::stream)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<StepEntry> createStepEntriesForOwnerProjects(final LocalDate date, final Step step, final List<Project> projects, final List<User> users, final User ownerUser) {
@@ -157,7 +157,7 @@ private List<StepEntry> createStepEntriesForOwnerProjects(final LocalDate date,
                 .filter(project -> project.getEmployees().contains(ownerUser.getUserId()))
                 .map(project -> createStepEntriesForOwnerProject(date, step, project, users, ownerUser))
                 .flatMap(Collection::stream)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<StepEntry> createStepEntriesForOwnerProject(final LocalDate date, final Step step, final Project project, final List<User> users, final User ownerUser) {
@@ -174,14 +174,14 @@ private List<StepEntry> createStepEntriesForOwnerProject(final LocalDate date, f
                         .assignee(leadUser)
                         .step(step)
                         .build())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<StepEntry> createStepEntriesOmForUsers(final LocalDate date, final Step step, final List<User> omUsers, final List<User> users) {
         return users.stream()
                 .map(ownerUser -> createStepEntriesForOwnerOmUsers(date, step, omUsers, ownerUser))
                 .flatMap(Collection::stream)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<StepEntry> createStepEntriesForOwnerOmUsers(final LocalDate date, final Step step, final List<User> omUsers, final User ownerUser) {
@@ -194,7 +194,7 @@ private List<StepEntry> createStepEntriesForOwnerOmUsers(final LocalDate date, f
                         .assignee(omUser)
                         .step(step)
                         .build())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<StepEntry> createStepEntriesForUsers(final LocalDate date, final Step step, final List<User> users) {
@@ -207,7 +207,7 @@ private List<StepEntry> createStepEntriesForUsers(final LocalDate date, final St
                         .assignee(ownerUser)
                         .step(step)
                         .build())
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Optional<User> findUserByUserId(final List<User> users, final String userId) {
diff --git a/src/main/java/com/gepardec/mega/service/impl/StepServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/StepServiceImpl.java
index 44a436d95..b2176cdbd 100644
--- a/src/main/java/com/gepardec/mega/service/impl/StepServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/StepServiceImpl.java
@@ -27,6 +27,6 @@ public List<Step> getSteps() {
                         .ordinal(s.getOrdinal())
                         .role(s.getRole())
                         .build())
-                .collect(Collectors.toList());
+                .toList();
     }
 }
diff --git a/src/main/java/com/gepardec/mega/service/impl/SyncServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/SyncServiceImpl.java
index c27fb95b9..6587af790 100644
--- a/src/main/java/com/gepardec/mega/service/impl/SyncServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/SyncServiceImpl.java
@@ -194,7 +194,7 @@ private List<User> filterNotExistingEmployeesAndMapToUser(final List<Employee> e
         return employees.stream()
                 .filter(zepEmployee -> !zepIdToUser.containsKey(zepEmployee.getUserId()))
                 .map(employee -> mapper.mapEmployeeToNewUser(employee, projects, defaultLocale))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<User> filterUserNotMappedToEmployeesAndMarkUserDeactivated(final List<Employee> employees, final List<User> users) {
@@ -202,7 +202,7 @@ private List<User> filterUserNotMappedToEmployeesAndMarkUserDeactivated(final Li
         return users.stream()
                 .filter(user -> !zepIdToEmployee.containsKey(user.getZepId()))
                 .map(mapper::mapToDeactivatedUser)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<User> filterModifiedEmployeesAndUpdateUsers(final List<Employee> employees, final List<User> users, final List<Project> projects) {
@@ -213,7 +213,7 @@ private List<User> filterModifiedEmployeesAndUpdateUsers(final List<Employee> em
         final Locale defaultLocale = applicationConfig.getDefaultLocale();
         return existingUserToEmployee.entrySet().stream()
                 .map(entry -> mapper.mapEmployeeToUser(entry.getKey(), entry.getValue(), projects, defaultLocale))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Map<String, User> mapZepIdToUser(final List<User> users) {
diff --git a/src/main/java/com/gepardec/mega/service/impl/UserServiceImpl.java b/src/main/java/com/gepardec/mega/service/impl/UserServiceImpl.java
index e06055403..75b6686f1 100644
--- a/src/main/java/com/gepardec/mega/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/service/impl/UserServiceImpl.java
@@ -60,7 +60,7 @@ public List<User> findActiveUsers() {
         final List<com.gepardec.mega.db.entity.employee.User> activeUsers = userRepository.findActive();
         return activeUsers.stream()
                 .map(mapper::mapToDomain)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
@@ -72,6 +72,6 @@ public List<User> findByRoles(List<Role> roles) {
 
         return userRepository.findByRoles(roles).stream()
                 .map(mapper::mapToDomain)
-                .collect(Collectors.toList());
+                .toList();
     }
 }
diff --git a/src/main/java/com/gepardec/mega/service/mapper/EmployeeMapper.java b/src/main/java/com/gepardec/mega/service/mapper/EmployeeMapper.java
index c5ab5c83c..5d7362879 100644
--- a/src/main/java/com/gepardec/mega/service/mapper/EmployeeMapper.java
+++ b/src/main/java/com/gepardec/mega/service/mapper/EmployeeMapper.java
@@ -62,7 +62,7 @@ List<Range<LocalDate>> getEmploymentPeriods(MitarbeiterType mitarbeiterType) {
                 .flatMap(Collection::stream)
                 .filter(range -> range.getStartdatum() != null && range.getEnddatum() != null)
                 .map(this::mapBeschaeftigungszeitTypeToRange)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     LocalDate determineNewestExitDateOfEmploymentPeriods(List<Range<LocalDate>> periods) {
diff --git a/src/main/java/com/gepardec/mega/zep/impl/ZepRestServiceImpl.java b/src/main/java/com/gepardec/mega/zep/impl/ZepRestServiceImpl.java
index 4992e6c4b..c29f0dae1 100644
--- a/src/main/java/com/gepardec/mega/zep/impl/ZepRestServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/zep/impl/ZepRestServiceImpl.java
@@ -195,7 +195,7 @@ public List<Project> getProjectsForMonthYear(LocalDate monthYear) {
                 .forEach(i -> addProjectEmployeesToBuilder(projects.get(i), zepProjects.get(i)));
         return projects.stream()
                 .map(Project.Builder::build)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override
diff --git a/src/main/java/com/gepardec/mega/zep/impl/ZepSoapServiceImpl.java b/src/main/java/com/gepardec/mega/zep/impl/ZepSoapServiceImpl.java
index c9a53ae4f..251440211 100644
--- a/src/main/java/com/gepardec/mega/zep/impl/ZepSoapServiceImpl.java
+++ b/src/main/java/com/gepardec/mega/zep/impl/ZepSoapServiceImpl.java
@@ -472,7 +472,7 @@ private List<String> createProjectEmployees(final ProjektMitarbeiterListeType pr
                 .stream()
                 .filter(e -> filterActiveEmployees(monthYear, e.getVon(), e.getBis()))
                 .map(ProjektMitarbeiterType::getUserId)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private boolean filterActiveEmployees(final LocalDate monthYear, final String inProjectFrom, final String inProjectUntil) {
diff --git a/src/main/java/com/gepardec/mega/zep/mapper/AbsenceTimeMapper.java b/src/main/java/com/gepardec/mega/zep/mapper/AbsenceTimeMapper.java
index d86530dea..65895b026 100644
--- a/src/main/java/com/gepardec/mega/zep/mapper/AbsenceTimeMapper.java
+++ b/src/main/java/com/gepardec/mega/zep/mapper/AbsenceTimeMapper.java
@@ -23,7 +23,7 @@ public static List<AbsenceTime> mapList(List<FehlzeitType> absenceTimes) {
                    .map(AbsenceTimeMapper::map)
                    .filter(Objects::nonNull)
                    .sorted(Comparator.comparing(AbsenceTime::fromDate))
-                   .collect(Collectors.toList());
+                   .toList();
         }
 
         public static AbsenceTime map(FehlzeitType fehlzeitType) {
diff --git a/src/main/java/com/gepardec/mega/zep/mapper/ProjectEntryMapper.java b/src/main/java/com/gepardec/mega/zep/mapper/ProjectEntryMapper.java
index b0de84647..0e45e5bb8 100644
--- a/src/main/java/com/gepardec/mega/zep/mapper/ProjectEntryMapper.java
+++ b/src/main/java/com/gepardec/mega/zep/mapper/ProjectEntryMapper.java
@@ -23,7 +23,7 @@ public List<ProjectEntry> mapList(List<ProjektzeitType> projectTimes) {
                 .map(this::map)
                 .filter(Objects::nonNull)
                 .sorted(Comparator.comparing(ProjectEntry::getFromTime))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public ProjectEntry map(ProjektzeitType projektzeitType) {
diff --git a/src/main/java/com/gepardec/mega/zep/mapper/ProjectTimeMapper.java b/src/main/java/com/gepardec/mega/zep/mapper/ProjectTimeMapper.java
index e27efb3f1..d3d28a0c0 100644
--- a/src/main/java/com/gepardec/mega/zep/mapper/ProjectTimeMapper.java
+++ b/src/main/java/com/gepardec/mega/zep/mapper/ProjectTimeMapper.java
@@ -20,7 +20,7 @@ public static List<ProjectTime> mapList(List<ProjektzeitType> projectTimes) {
         return projectTimes.stream()
                 .map(ProjectTimeMapper::map)
                 .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public static ProjectTime map(ProjektzeitType projektzeitType) {
diff --git a/src/main/java/com/gepardec/mega/zep/rest/mapper/Mapper.java b/src/main/java/com/gepardec/mega/zep/rest/mapper/Mapper.java
index 303529649..e81a125cf 100644
--- a/src/main/java/com/gepardec/mega/zep/rest/mapper/Mapper.java
+++ b/src/main/java/com/gepardec/mega/zep/rest/mapper/Mapper.java
@@ -15,6 +15,6 @@ default List<D> mapList(List<T> tList) {
         return tList.stream()
                 .map(this::map)
                 .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+                .toList();
     }
 }
diff --git a/src/main/java/com/gepardec/mega/zep/rest/mapper/ProjectEntryMapper.java b/src/main/java/com/gepardec/mega/zep/rest/mapper/ProjectEntryMapper.java
index 73556ac50..e746b2602 100644
--- a/src/main/java/com/gepardec/mega/zep/rest/mapper/ProjectEntryMapper.java
+++ b/src/main/java/com/gepardec/mega/zep/rest/mapper/ProjectEntryMapper.java
@@ -72,7 +72,7 @@ public List<com.gepardec.mega.domain.model.monthlyreport.ProjectEntry> mapList(L
                 .map(this::map)
                 .filter(Objects::nonNull)
                 .sorted(Comparator.comparing(ProjectEntry::getFromTime))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private Task toTask(String activity) {
diff --git a/src/main/java/com/gepardec/mega/zep/rest/service/AbsenceService.java b/src/main/java/com/gepardec/mega/zep/rest/service/AbsenceService.java
index e22e9c586..2594b7386 100644
--- a/src/main/java/com/gepardec/mega/zep/rest/service/AbsenceService.java
+++ b/src/main/java/com/gepardec/mega/zep/rest/service/AbsenceService.java
@@ -57,6 +57,6 @@ public ZepAbsence getZepAbsenceById(int id) {
     private List<ZepAbsence> getFullZepAbsences(List<ZepAbsence> zepAbsences) {
         return zepAbsences.stream()
                 .map(absence -> getZepAbsenceById(absence.id()))
-                .collect(Collectors.toList());
+                .toList();
     }
 }
diff --git a/src/main/java/com/gepardec/mega/zep/rest/service/AttendanceService.java b/src/main/java/com/gepardec/mega/zep/rest/service/AttendanceService.java
index 3986e251e..5259e9dbf 100644
--- a/src/main/java/com/gepardec/mega/zep/rest/service/AttendanceService.java
+++ b/src/main/java/com/gepardec/mega/zep/rest/service/AttendanceService.java
@@ -33,7 +33,7 @@ public List<ZepAttendance> getBillableAttendancesForUserAndMonth(String username
             List<ZepAttendance> attendances = this.getAttendanceForUserAndMonth(username, date);
             return attendances.stream()
                     .filter(ZepAttendance::billable)
-                    .collect(Collectors.toList());
+                    .toList();
         } catch (ZepServiceException e) {
             logger.warn("Error retrieving billable attendances for user + \"%s\" from ZEP: No /data field in response"
                     .formatted(username), e);
@@ -68,7 +68,7 @@ public List<ZepAttendance> getAttendanceForUserProjectAndMonth(String username,
 
             return attendances.stream()
                     .filter(attendance -> Objects.equals(attendance.projectId(), projectId))
-                    .collect(Collectors.toList());
+                    .toList();
         } catch (ZepServiceException e) {
             logger.warn(("Error retrieving billable attendances for user \"%s\" and project \"%d\" from ZEP: " +
                     "No /data field in response")
diff --git a/src/test/java/com/gepardec/mega/domain/calculation/time/NoEntryCalculatorTest.java b/src/test/java/com/gepardec/mega/domain/calculation/time/NoEntryCalculatorTest.java
index 6b591606b..226f998e3 100644
--- a/src/test/java/com/gepardec/mega/domain/calculation/time/NoEntryCalculatorTest.java
+++ b/src/test/java/com/gepardec/mega/domain/calculation/time/NoEntryCalculatorTest.java
@@ -154,7 +154,7 @@ void calculate_whenDateInFuture_thenNoWarning() {
         List<TimeWarning> result = noEntryCalculator.calculate(createEmployee(), List.of(createProjectTimeEntryForFuture(LocalDate.now())), createAbsenceListFromType(AbsenteeType.NON_PAID_VACATION_DAYS));
         List<TimeWarning> resultsAfterToday = result.stream()
                 .filter(timeWarning -> timeWarning.getDate().isAfter(LocalDate.now()))
-                .collect(Collectors.toList());
+                .toList();
 
 
         assertThat(resultsAfterToday).isEmpty();
@@ -165,7 +165,7 @@ void calculate_whenDateToday_thenNoWarning() {
         List<TimeWarning> result = noEntryCalculator.calculate(createEmployee(), List.of(createProjectTimeEntryForFuture(LocalDate.now())), createAbsenceListFromType(AbsenteeType.NON_PAID_VACATION_DAYS));
         List<TimeWarning> resultsAfterToday = result.stream()
                 .filter(timeWarning -> timeWarning.getDate().isEqual(LocalDate.now()))
-                .collect(Collectors.toList());
+                .toList();
 
 
         assertThat(resultsAfterToday).isEmpty();
diff --git a/src/test/java/com/gepardec/mega/notification/mail/dates/OfficeCalendarUtilTest.java b/src/test/java/com/gepardec/mega/notification/mail/dates/OfficeCalendarUtilTest.java
index 44990d914..60f59fc46 100644
--- a/src/test/java/com/gepardec/mega/notification/mail/dates/OfficeCalendarUtilTest.java
+++ b/src/test/java/com/gepardec/mega/notification/mail/dates/OfficeCalendarUtilTest.java
@@ -32,7 +32,7 @@ class OfficeCalendarUtilTest {
 
     @Test
     void doesHolidayApiReturnCorrectHolidays() {
-        List<LocalDate> actual = OfficeCalendarUtil.getHolidaysForYear(2022).collect(Collectors.toList());
+        List<LocalDate> actual = OfficeCalendarUtil.getHolidaysForYear(2022).toList();
 
         assertThat(actual).containsExactlyInAnyOrderElementsOf(holidates);
     }
diff --git a/src/test/java/com/gepardec/mega/service/impl/employee/EmployeeServiceImplTest.java b/src/test/java/com/gepardec/mega/service/impl/employee/EmployeeServiceImplTest.java
index f6492f60a..b9d7a76ed 100644
--- a/src/test/java/com/gepardec/mega/service/impl/employee/EmployeeServiceImplTest.java
+++ b/src/test/java/com/gepardec/mega/service/impl/employee/EmployeeServiceImplTest.java
@@ -174,7 +174,7 @@ void testUpdateEmployeesReleaseDate_EmployeesNotEmpty_ThreadingError() {
             }
         }).when(managedExecutor).execute(Mockito.any());
 
-        final List<Employee> employees = IntStream.range(0, 40).mapToObj(i -> createEmployee(i).build()).collect(Collectors.toList());
+        final List<Employee> employees = IntStream.range(0, 40).mapToObj(i -> createEmployee(i).build()).toList();
 
         final List<String> result = employeeService.updateEmployeesReleaseDate(employees);
 
diff --git a/src/test/java/com/gepardec/mega/service/impl/init/StepEntrySyncServiceImplTest.java b/src/test/java/com/gepardec/mega/service/impl/init/StepEntrySyncServiceImplTest.java
index 6f69c42e1..19e8a6cb2 100644
--- a/src/test/java/com/gepardec/mega/service/impl/init/StepEntrySyncServiceImplTest.java
+++ b/src/test/java/com/gepardec/mega/service/impl/init/StepEntrySyncServiceImplTest.java
@@ -66,35 +66,35 @@ void setUp() {
                 projectFor(1)
                         .leads(
                                 List.of(userForProjectLead(1))
-                                        .stream().map(User::getUserId).collect(Collectors.toList()))
+                                        .stream().map(User::getUserId).toList())
                         .employees(
                                 List.of(userForProjectLead(1),
                                                 userForEmployee(4),
                                                 userForEmployee(5),
                                                 userForEmployee(6))
-                                        .stream().map(User::getUserId).collect(Collectors.toList()))
+                                        .stream().map(User::getUserId).toList())
                         .startDate(LocalDate.now())
                         .build(),
                 projectFor(2)
                         .leads(
                                 List.of(userForProjectLead(2))
-                                        .stream().map(User::getUserId).collect(Collectors.toList()))
+                                        .stream().map(User::getUserId).toList())
                         .employees(
                                 List.of(userForProjectLead(2),
                                                 userForEmployee(5),
                                                 userForEmployee(6))
-                                        .stream().map(User::getUserId).collect(Collectors.toList()))
+                                        .stream().map(User::getUserId).toList())
                         .startDate(LocalDate.now())
                         .build(),
                 projectFor(3)
                         .leads(
                                 List.of(userForProjectLead(1))
-                                        .stream().map(User::getUserId).collect(Collectors.toList()))
+                                        .stream().map(User::getUserId).toList())
                         .employees(
                                 List.of(userForProjectLead(1),
                                                 userForEmployee(5),
                                                 userForEmployee(6))
-                                        .stream().map(User::getUserId).collect(Collectors.toList()))
+                                        .stream().map(User::getUserId).toList())
                         .startDate(LocalDate.now())
                         .build()
         ));
@@ -191,13 +191,13 @@ void whenProjectLeadIsInactive_thenDoNotInsertProjectLead() {
         when(projectService.getProjectsForMonthYear(Mockito.any(), Mockito.anyList())).thenReturn(List.of(projectFor(1)
                 .leads(
                         List.of(userForProjectLead(7))
-                                .stream().map(User::getUserId).collect(Collectors.toList()))
+                                .stream().map(User::getUserId).toList())
                 .employees(
                         List.of(userForProjectLead(1),
                                         userForEmployee(4),
                                         userForEmployee(5),
                                         userForEmployee(6))
-                                .stream().map(User::getUserId).collect(Collectors.toList()))
+                                .stream().map(User::getUserId).toList())
                 .startDate(LocalDate.now())
                 .build()));
 
diff --git a/src/test/java/com/gepardec/mega/service/impl/project/ProjectServiceImplTest.java b/src/test/java/com/gepardec/mega/service/impl/project/ProjectServiceImplTest.java
index 266eda4d8..6da319df2 100644
--- a/src/test/java/com/gepardec/mega/service/impl/project/ProjectServiceImplTest.java
+++ b/src/test/java/com/gepardec/mega/service/impl/project/ProjectServiceImplTest.java
@@ -103,7 +103,7 @@ void whenFilterLeads_thenReturnProjectListWithLeads() {
                                         .lastname("Gepardec")
                                         .email(String.format("%s%s.%s@gepardec.com", "Gepard", 1, "Gepardec"))
                                         .roles(Set.of(Role.EMPLOYEE)).build())
-                                .stream().map(User::getUserId).collect(Collectors.toList()))
+                                .stream().map(User::getUserId).toList())
                         .employees(List.of())
                         .categories(List.of())
                         .startDate(LocalDate.now())
diff --git a/src/test/java/com/gepardec/mega/service/mapper/EmployeeMapperTest.java b/src/test/java/com/gepardec/mega/service/mapper/EmployeeMapperTest.java
index 642d8f382..f8d5e88b3 100644
--- a/src/test/java/com/gepardec/mega/service/mapper/EmployeeMapperTest.java
+++ b/src/test/java/com/gepardec/mega/service/mapper/EmployeeMapperTest.java
@@ -301,7 +301,7 @@ private BeschaeftigungszeitListeType getBeschaeftigungszeitListeMock(List<Pair<L
                 bt.setEnddatum(Optional.ofNullable(x.getRight()).map(LocalDate::toString).orElse(null));
 
                 return bt;
-            }).collect(Collectors.toList());
+            }).toList();
 
 
             // Mocking needed because no setter methods provided
diff --git a/src/test/java/com/gepardec/mega/zep/rest/util/ResponseParserTest.java b/src/test/java/com/gepardec/mega/zep/rest/util/ResponseParserTest.java
index d8403e261..7ffab88f4 100644
--- a/src/test/java/com/gepardec/mega/zep/rest/util/ResponseParserTest.java
+++ b/src/test/java/com/gepardec/mega/zep/rest/util/ResponseParserTest.java
@@ -49,7 +49,7 @@ public void withFullPaginatedJsons_thenReturnList() {
 
 
         List<ZepProject> projectList = responseParser.retrieveAll(page -> zepProjectRestClient.getProjects(page), ZepProject.class);
-        List<String> projectNames = projectList.stream().map(ZepProject::name).peek(System.out::println).collect(Collectors.toList());
+        List<String> projectNames = projectList.stream().map(ZepProject::name).peek(System.out::println).toList();
         System.out.println(projectNames);
         Arrays.stream(names).forEach(name -> assertThat(projectNames.contains(name)).isTrue());
     }