diff --git a/src/main/java/eu/openaire/urls_worker/components/ScheduledTasks.java b/src/main/java/eu/openaire/urls_worker/components/ScheduledTasks.java
index de7528a..c5dbd63 100644
--- a/src/main/java/eu/openaire/urls_worker/components/ScheduledTasks.java
+++ b/src/main/java/eu/openaire/urls_worker/components/ScheduledTasks.java
@@ -65,7 +65,7 @@ public class ScheduledTasks {
     }
 
 
-    @Scheduled(initialDelay = 120_000, fixedDelay = 120_000)  // TODO - MAKE THE NUMBER TO BE EQUAL TO 30 mins (in millis)
+    @Scheduled(initialDelay = 1_800_000, fixedDelay = 1_800_000)
     public void checkIfShouldShutdown()
     {
         if ( !GeneralController.shouldShutdownWorker && !AssignmentsHandler.shouldNotRequestMore )
@@ -99,7 +99,7 @@ public class ScheduledTasks {
 
     private static final int hoursToWaitBeforeDeletion = 36;
 
-    @Scheduled(initialDelay = 60_000, fixedDelay = 60_000)  // TODO - MAKE THE NUMBER TO BE EQUAL TO 6-HOURS (in millis)
+    @Scheduled(initialDelay = 21_600_000, fixedDelay = 21_600_000)
     public void checkAndDeleteOldFiles() {
         // For any reason the Worker-report connection with the Controller may fail, but the Controller will continue requesting the full-text batches.