diff --git a/.github/workflows/parallel.yml b/.github/workflows/parallel.yml
index ddf6caff6778..09714f01763e 100644
--- a/.github/workflows/parallel.yml
+++ b/.github/workflows/parallel.yml
@@ -119,6 +119,7 @@ jobs:
         php artisan optimize
         php artisan cache:clear
         php artisan config:cache
+        php artisan ninja:post-update
     - name: Create DB and schemas
       run: |
         mkdir -p database
diff --git a/app/Console/Commands/PostUpdate.php b/app/Console/Commands/PostUpdate.php
index 007a9bed6211..73d7d1e10896 100644
--- a/app/Console/Commands/PostUpdate.php
+++ b/app/Console/Commands/PostUpdate.php
@@ -13,11 +13,14 @@ namespace App\Console\Commands;
 
 use App\Jobs\Util\VersionCheck;
 use App\Utils\Ninja;
+use App\Utils\Traits\AppSetup;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 
 class PostUpdate extends Command
 {
+    use AppSetup;
+
     /**
      * The name and signature of the console command.
      *
@@ -83,6 +86,8 @@ class PostUpdate extends Command
 
         info('queue restarted');
 
+        $this->buildCache(true);
+
         VersionCheck::dispatch();
 
         info('Sent for version check');
diff --git a/app/DataMapper/Schedule/ClientStatement.php b/app/DataMapper/Schedule/ClientStatement.php
index 37ba76d081cb..6ab2284f771b 100644
--- a/app/DataMapper/Schedule/ClientStatement.php
+++ b/app/DataMapper/Schedule/ClientStatement.php
@@ -9,7 +9,7 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-namespace App\DataMapper;
+namespace App\DataMapper\Schedule;
 
 use App\Models\Client;
 use stdClass;
diff --git a/app/Http/Requests/TaskScheduler/DestroySchedulerRequest.php b/app/Http/Requests/TaskScheduler/DestroySchedulerRequest.php
index 93e15f06df95..48f5b7cb09c6 100644
--- a/app/Http/Requests/TaskScheduler/DestroySchedulerRequest.php
+++ b/app/Http/Requests/TaskScheduler/DestroySchedulerRequest.php
@@ -9,7 +9,7 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-namespace App\Http\Requests\Task;
+namespace App\Http\Requests\TaskScheduler;
 
 use App\Http\Requests\Request;
 
diff --git a/tests/Feature/Email/EmailTest.php b/tests/Feature/Email/EmailTest.php
index 40dadc5ca6e4..cedbaba55b48 100644
--- a/tests/Feature/Email/EmailTest.php
+++ b/tests/Feature/Email/EmailTest.php
@@ -9,7 +9,7 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-namespace Tests\Feature;
+namespace Tests\Feature\Email;
 
 use App\Services\Email\EmailObject;
 use App\Services\Email\EmailService;