diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml
index 4b05f4736b..176a237412 100644
--- a/.github/workflows/deploy-pm4.yml
+++ b/.github/workflows/deploy-pm4.yml
@@ -15,5 +15,5 @@ concurrency:
 jobs:
   run:
     name: Run PM4-workflow
-    uses: processmaker/.github/.github/workflows/deploy-pm4.yml@main
+    uses: processmaker/.github/.github/workflows/deploy-pm4.yml@enable-octane-cicd
     secrets: inherit
diff --git a/config/octane.php b/config/octane.php
index 9e221adfcd..2277831302 100644
--- a/config/octane.php
+++ b/config/octane.php
@@ -22,6 +22,9 @@
 use Laravel\Octane\Listeners\ReportException;
 use Laravel\Octane\Listeners\StopWorkerIfNecessary;
 use Laravel\Octane\Octane;
+use ProcessMaker\Models\AnonymousUser;
+
+$multitenancyEnabled = filter_var(env('MULTITENANCY', false), FILTER_VALIDATE_BOOL);
 
 return [
 
@@ -132,7 +135,11 @@
 
     'warm' => [
         ...Octane::defaultServicesToWarm(),
-        ProcessMaker\Models\AnonymousUser::class,
+        // AnonymousUser is tenant-scoped; warming it at worker boot queries the
+        // default connection before any tenant is resolved (breaks multitenancy).
+        ...($multitenancyEnabled ? [] : [
+            AnonymousUser::class,
+        ]),
         ProcessMaker\ImportExport\Extension::class,
         ProcessMaker\ImportExport\SignalHelper::class,
         ProcessMaker\Managers\MenuManager::class,
@@ -156,6 +163,9 @@
         ProcessMaker\Managers\LoginManager::class,
         ProcessMaker\Managers\ModelerManager::class,
         Lavary\Menu\Menu::class,
+        ...($multitenancyEnabled ? [
+            AnonymousUser::class,
+        ] : []),
     ],
 
     /*