diff --git a/config/settings.yml b/config/settings.yml
index 9d2617e21..ff72cb3c0 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -40,7 +40,7 @@ bearer-expiration: 604800
 bearer-encoding: HS256
 maximum-content-length: "_env:MAX_UPLOAD_SIZE:805306368"
 session-files-expire: 3600
-prune-unreferenced-files-within: 57600
+prune-unreferenced-files-within: 604801
 prune-unreferenced-files-interval: 3600
 keep-unreferenced-files: 86400
 health-check-interval:
diff --git a/src/Jobs/Crontab.hs b/src/Jobs/Crontab.hs
index b690ddf2c..368daf8de 100644
--- a/src/Jobs/Crontab.hs
+++ b/src/Jobs/Crontab.hs
@@ -322,7 +322,7 @@ determineCrontab = execWriterT $ do
                 { cronInitial   = CronTimestamp $ utcToLocalTimeTZ appTZ nextIntervalTime
                 , cronRepeat    = CronRepeatNever
                 , cronRateLimit = appSynchroniseLdapUsersInterval
-                , cronNotAfter  = Left syncWithin
+                , cronNotAfter  = Right . CronTimestamp . utcToLocalTimeTZ appTZ $ addUTCTime appSynchroniseLdapUsersInterval nextIntervalTime
                 }
       | otherwise
        -> return ()
@@ -341,7 +341,7 @@ determineCrontab = execWriterT $ do
             { cronInitial   = CronTimestamp $ utcToLocalTimeTZ appTZ nextIntervalTime
             , cronRepeat    = CronRepeatNever
             , cronRateLimit = appPruneUnreferencedFilesInterval
-            , cronNotAfter  = Left within
+            , cronNotAfter  = Right . CronTimestamp . utcToLocalTimeTZ appTZ $ addUTCTime appPruneUnreferencedFilesInterval nextIntervalTime
             }
 
     whenIsJust ((,) <$> appStudyFeaturesRecacheRelevanceWithin <*> appJobCronInterval) $ \(within, cInterval) -> do
@@ -358,7 +358,7 @@ determineCrontab = execWriterT $ do
             { cronInitial   = CronTimestamp $ utcToLocalTimeTZ appTZ nextIntervalTime
             , cronRepeat    = CronRepeatNever
             , cronRateLimit = appStudyFeaturesRecacheRelevanceInterval
-            , cronNotAfter  = Left within
+            , cronNotAfter  = Right . CronTimestamp . utcToLocalTimeTZ appTZ $ addUTCTime appStudyFeaturesRecacheRelevanceInterval nextIntervalTime
             }
 
     let