diff --git a/lib/nerves_hub/deployments/deployment.ex b/lib/nerves_hub/deployments/deployment.ex
index b5f4f7549..980cc602f 100644
--- a/lib/nerves_hub/deployments/deployment.ex
+++ b/lib/nerves_hub/deployments/deployment.ex
@@ -75,10 +75,7 @@ defmodule NervesHub.Deployments.Deployment do
     field(:device_count, :integer, virtual: true)
 
     # temporary addition while we feature test a new deployment management strategy
-    field(:orchestrator_strategy, Ecto.Enum,
-      values: [:multi, :distributed],
-      default: :distributed
-    )
+    field(:orchestrator_strategy, Ecto.Enum, values: [:multi, :distributed], default: :multi)
 
     timestamps()
   end
diff --git a/lib/nerves_hub/deployments/distributed/orchestrator.ex b/lib/nerves_hub/deployments/distributed/orchestrator.ex
index fae692d10..720be47aa 100644
--- a/lib/nerves_hub/deployments/distributed/orchestrator.ex
+++ b/lib/nerves_hub/deployments/distributed/orchestrator.ex
@@ -279,9 +279,7 @@ defmodule NervesHub.Deployments.Distributed.Orchestrator do
   def start_orchestrator(
         %Deployment{is_active: true, orchestrator_strategy: :distributed} = deployment
       ) do
-    if Application.get_env(:nerves_hub, :deploy_env) != "test" do
-      ProcessHub.start_child(:deployment_orchestrators, child_spec(deployment))
-    end
+    ProcessHub.start_child(:deployment_orchestrators, child_spec(deployment))
   end
 
   def start_orchestrator(_) do
diff --git a/priv/repo/migrations/20250213215925_set_default_deployment_orchestrator_strategy.exs b/priv/repo/migrations/20250213215925_set_default_deployment_orchestrator_strategy.exs
index dba03ce58..c98fafc14 100644
--- a/priv/repo/migrations/20250213215925_set_default_deployment_orchestrator_strategy.exs
+++ b/priv/repo/migrations/20250213215925_set_default_deployment_orchestrator_strategy.exs
@@ -5,6 +5,6 @@ defmodule NervesHub.Repo.Migrations.SetDefaultDeploymentOrchestratorStrategy do
   alias NervesHub.Repo
 
   def change do
-    Repo.update_all(Deployment, set: [orchestrator_strategy: "distributed"])
+    Repo.update_all(Deployment, set: [orchestrator_strategy: "multi"])
   end
 end
diff --git a/test/nerves_hub_web/channels/websocket_test.exs b/test/nerves_hub_web/channels/websocket_test.exs
index 4d8b7a34c..1a594fcb9 100644
--- a/test/nerves_hub_web/channels/websocket_test.exs
+++ b/test/nerves_hub_web/channels/websocket_test.exs
@@ -6,7 +6,7 @@ defmodule NervesHubWeb.WebsocketTest do
   alias NervesHub.AuditLogs
   alias NervesHub.AuditLogs.AuditLog
   alias NervesHub.Deployments
-  alias NervesHub.Deployments.Distributed.Orchestrator
+  alias NervesHub.Deployments.Orchestrator
   alias NervesHub.Devices
   alias NervesHub.Devices.Connections
   alias NervesHub.Devices.Device