diff --git a/app/Console/Commands/S3Cleanup.php b/app/Console/Commands/S3Cleanup.php
new file mode 100644
index 000000000000..f7409764b3a5
--- /dev/null
+++ b/app/Console/Commands/S3Cleanup.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Company;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class S3Cleanup extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'ninja:s3-cleanup';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Remove orphan folders';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+
+        $c1 = Company::on('db-ninja-01')->pluck('company_key');
+        $c2 = Company::on('db-ninja-02')->pluck('company_key');
+
+        $merged = $c1->merge($c2)->toArray();
+
+        $directories = Storage::disk(config('filesystems.default'))->directories();
+
+        $this->LogMessage("Disk Cleanup");
+
+            foreach($directories as $dir)
+            {
+                if(!in_array($dir, $merged))
+                {
+                    $this->logMessage("Deleting $dir");
+                    Storage::disk(config('filesystems.default'))->deleteDirectory($dir);
+                }
+            }        
+
+        $this->logMessage("exiting");
+
+    }
+
+    private function logMessage($str)
+    {
+        $str = date('Y-m-d h:i:s').' '.$str;
+        $this->info($str);
+        $this->log .= $str."\n";
+    }
+}
diff --git a/app/Http/Requests/Company/StoreCompanyRequest.php b/app/Http/Requests/Company/StoreCompanyRequest.php
index 12b3c9a26e8e..3fb397608d0f 100644
--- a/app/Http/Requests/Company/StoreCompanyRequest.php
+++ b/app/Http/Requests/Company/StoreCompanyRequest.php
@@ -49,7 +49,7 @@ class StoreCompanyRequest extends Request
         } else {
            
             if(Ninja::isHosted()){
-                $rules['subdomain'] = ['nullable', 'alpha_num', new ValidSubdomain($this->all())];
+                $rules['subdomain'] = ['nullable', 'regex:/^[a-zA-Z0-9][a-zA-Z0-9.-]+[a-zA-Z0-9]$/', new ValidSubdomain($this->all())];
             }
             else
                 $rules['subdomain'] = 'nullable|alpha_num';
diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php
index 42fb295e7f70..01b94b28de38 100644
--- a/app/Http/Requests/Company/UpdateCompanyRequest.php
+++ b/app/Http/Requests/Company/UpdateCompanyRequest.php
@@ -50,7 +50,7 @@ class UpdateCompanyRequest extends Request
         } else {
 
             if(Ninja::isHosted()){
-                $rules['subdomain'] = ['nullable', 'alpha_num', new ValidSubdomain($this->all())];
+                $rules['subdomain'] = ['nullable', 'regex:/^[a-zA-Z0-9][a-zA-Z0-9.-]+[a-zA-Z0-9]$/', new ValidSubdomain($this->all())];
             }
             else
                 $rules['subdomain'] = 'nullable|alpha_num';
diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index cd9682e98b4f..d86ee6b041e9 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -105,6 +105,7 @@ class CreateEntityPdf implements ShouldQueue
         /* Set customized translations _NOW_ */
         $t->replace(Ninja::transformTranslations($this->entity->client->getMergedSettings()));
 
+        /*This line of code hurts... it deletes ALL $entity PDFs... this causes a race condition when trying to send an email*/
         // $this->entity->service()->deletePdf();
 
         if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
diff --git a/tests/Unit/S3CleanupTest.php b/tests/Unit/S3CleanupTest.php
new file mode 100644
index 000000000000..b4056ff4f5e0
--- /dev/null
+++ b/tests/Unit/S3CleanupTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+namespace Tests\Unit;
+
+use App\DataMapper\ClientSettings;
+use Tests\TestCase;
+
+/**
+ * @test
+ */
+class S3CleanupTest extends TestCase
+{
+    public function setUp() :void
+    {
+        parent::setUp();
+    }
+
+    public function testMergeCollections()
+    {
+        $c1 = collect(["1","2","3","4"]);
+        $c2 = collect(["5","6","7","8"]);
+
+        $c3 = collect(["1","2","10"]);
+
+        $merged = $c1->merge($c2)->toArray();
+
+        $this->assertTrue(in_array("1", $merged));
+        $this->assertFalse(in_array("10", $merged));
+           
+    }
+}