diff --git a/.idea/runConfigurations/_template__of_Gradle.xml b/.idea/runConfigurations/_template__of_Gradle.xml
index edb7dae745cc..7c6cecee1dad 100644
--- a/.idea/runConfigurations/_template__of_Gradle.xml
+++ b/.idea/runConfigurations/_template__of_Gradle.xml
@@ -4,7 +4,6 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-x webapp" />
       <option name="scriptParameters" value="-x nodeSetup -x npmSetup -x npmInstall -x webapp" />
       <option name="taskDescriptions">
         <list />
@@ -20,4 +19,4 @@
     <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java
index 6a9f55e3c9de..fac57f5c2c0a 100644
--- a/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java
+++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java
@@ -11,6 +11,7 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.hibernate.Hibernate;
 import org.slf4j.Logger;
@@ -88,17 +89,17 @@ public void cleanup() {
             log.error("Exception occurred during cleanupBuildPlansOnContinuousIntegrationServer", ex);
         }
         try {
-            cleanupGitRepositoriesOnArtemisServer();
+            cleanupGitWorkingCopiesOnArtemisServer();
         }
         catch (Exception ex) {
-            log.error("Exception occurred during cleanupGitRepositoriesOnArtemisServer", ex);
+            log.error("Exception occurred during cleanupGitWorkingCopiesOnArtemisServer", ex);
         }
     }
 
     /**
      * cleans up old local git repositories on the Artemis server
      */
-    public void cleanupGitRepositoriesOnArtemisServer() {
+    public void cleanupGitWorkingCopiesOnArtemisServer() {
         SecurityUtils.setAuthorizationObject();
         log.info("Cleanup git repositories on Artemis server");
         // we are specifically interested in exercises older than 8 weeks
@@ -134,12 +135,11 @@ private void cleanStudentParticipationsRepositories(ZonedDateTime earliestDate,
                 pageable);
         log.info("Found {} student participations to clean local student repositories in {} batches.", uriBatch.getTotalElements(), uriBatch.getTotalPages());
         if (uriBatch.getTotalElements() > 0) {
-            do {
-                uriBatch.forEach(this::deleteLocalRepositoryByUriString);
-                uriBatch = programmingExerciseStudentParticipationRepository.findRepositoryUrisForGitCleanupByRecentDueDateOrRecentExamEndDate(earliestDate, latestDate,
-                        uriBatch.nextPageable());
-            }
-            while (uriBatch.hasNext());
+            var ignored = Stream.iterate(uriBatch, Page::hasNext, page -> {
+                page.forEach(this::deleteLocalRepositoryByUriString);
+                return programmingExerciseStudentParticipationRepository.findRepositoryUrisForGitCleanupByRecentDueDateOrRecentExamEndDate(earliestDate, latestDate,
+                        page.nextPageable());
+            });
             log.info("Finished cleaning local student repositories");
         }
     }
diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java
index f3b63117216d..6cc49e30ec56 100644
--- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java
+++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java
@@ -2383,7 +2383,7 @@ void automaticCleanupGitRepositories() {
         createProgrammingParticipationWithSubmissionAndResult(examExercise, "student3", 100D, ZonedDateTime.now().minusDays(2L), false);
         createProgrammingParticipationWithSubmissionAndResult(examExercise, "student4", 80D, ZonedDateTime.now().minusDays(6L), false);
 
-        automaticProgrammingExerciseCleanupService.cleanupGitRepositoriesOnArtemisServer();
+        automaticProgrammingExerciseCleanupService.cleanupGitWorkingCopiesOnArtemisServer();
         // Note: at the moment, we cannot easily assert something here, it might be possible to verify mocks on gitService, in case we could define it as SpyBean
     }