diff --git a/app/Console/Commands/S3Cleanup.php b/app/Console/Commands/S3Cleanup.php
index f7409764b3a5..6aa4d2d3b1d4 100644
--- a/app/Console/Commands/S3Cleanup.php
+++ b/app/Console/Commands/S3Cleanup.php
@@ -20,7 +20,7 @@ class S3Cleanup extends Command
      *
      * @var string
      */
-    protected $description = 'Remove orphan folders';
+    protected $description = 'Remove orphan folders/files';
 
     /**
      * Create a new command instance.
@@ -54,7 +54,11 @@ class S3Cleanup extends Command
                 if(!in_array($dir, $merged))
                 {
                     $this->logMessage("Deleting $dir");
-                    Storage::disk(config('filesystems.default'))->deleteDirectory($dir);
+
+                    /* Ensure we are not deleting the root folder */
+                    if(strlen($dir) > 1)
+                        Storage::disk(config('filesystems.default'))->deleteDirectory($dir);
+                    
                 }
             }        
 
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 10cb1bb3f95c..30833128eb7f 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -71,7 +71,8 @@ class Kernel extends ConsoleKernel
 
             $schedule->job(new AdjustEmailQuota)->dailyAt('23:00')->withoutOverlapping();
             $schedule->job(new SendFailedEmails)->daily()->withoutOverlapping();
-            $schedule->command('ninja:check-data --database=db-ninja-02')->daily()->withoutOverlapping();
+            $schedule->command('ninja:check-data --database=db-ninja-02')->dailyAt('00:15')->withoutOverlapping();
+            $schedule->command('ninja:s3-cleanup')->dailyAt('23:15')->withoutOverlapping();
 
         }