diff --git a/config/config.exs b/config/config.exs
index ffafd34..38ce82d 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -18,7 +18,7 @@ config :localiserd, Localiser.Web.Endpoint,
 config :localiserd, :jwt_secret,
   System.get_env("JWT_SECRET") || "localiser_dev_jwt_secret_change_in_prod!!"
 
-config :localiser, enrollment_timeout_ms: 10_000
+config :localiserd, enrollment_timeout_ms: 20_000
 
 config :mdns_lite,
   hosts: ["localiser"],
@@ -38,6 +38,6 @@ config :mdns_lite,
       id: :mqtt,
       protocol: "mqtt",
       transport: "tcp",
-      port: Application.compile_env(:localiser, :mqtt_port, 1883)
+      port: Application.compile_env(:localiserd, :mqtt_port, 1883)
     }
   ]
diff --git a/lib/localiser/domain/sensors.ex b/lib/localiser/domain/sensors.ex
index 884daed..00a6fde 100644
--- a/lib/localiser/domain/sensors.ex
+++ b/lib/localiser/domain/sensors.ex
@@ -110,7 +110,7 @@ defmodule Localiser.Domain.Sensors do
 
   # Sensor lifecycle / enrollment helpers
 
-  @enrollment_timeout_ms Application.compile_env(:localiser, :enrollment_timeout_ms, 10_000)
+  @enrollment_timeout_ms Application.compile_env(:localiserd, :enrollment_timeout_ms, 10_000)
 
   # Called by the phone app to indicate a sensor is about to come online.
   # Creates an unconfirmed sensor record and starts a timeout Task.
diff --git a/lib/localiser/mqtt/connection.ex b/lib/localiser/mqtt/connection.ex
index a49af6a..a473d84 100644
--- a/lib/localiser/mqtt/connection.ex
+++ b/lib/localiser/mqtt/connection.ex
@@ -6,8 +6,8 @@ defmodule Localiser.MQTT.Connection do
   use GenServer
   require Logger
 
-  @broker_host Application.compile_env(:localiser, :mqtt_host, "localhost")
-  @broker_port Application.compile_env(:localiser, :mqtt_port, 1883)
+  @broker_host Application.compile_env(:localiserd, :mqtt_host, "localhost")
+  @broker_port Application.compile_env(:localiserd, :mqtt_port, 1883)
 
   @rssi_topic "localiser/sensor/+/rssi"
   @announce_topic "localiser/sensor/+/announce"