diff --git a/app/src/lib/components/icons/index.ts b/app/src/lib/components/icons/index.ts
index 91c13a2..3a26707 100644
--- a/app/src/lib/components/icons/index.ts
+++ b/app/src/lib/components/icons/index.ts
@@ -50,7 +50,7 @@ export { default as Power } from '~icons/tabler/power'
 export { default as MAC } from '~icons/tabler/dna-2'
 export { default as Home } from '~icons/tabler/home'
 export { default as SSID } from '~icons/tabler/router'
-export { default as DNS } from '~icons/tabler/address-book'
+export { default as DNS } from '~icons/mdi/dns'
 export { default as Gateway } from '~icons/tabler/torii'
 export { default as Subnet } from '~icons/tabler/grid-dots'
 export { default as Channel } from '~icons/tabler/antenna'
diff --git a/app/src/lib/components/menu/Menu.svelte b/app/src/lib/components/menu/Menu.svelte
index 90dd902..bee952c 100644
--- a/app/src/lib/components/menu/Menu.svelte
+++ b/app/src/lib/components/menu/Menu.svelte
@@ -19,7 +19,8 @@
     Router,
     AP,
     Copyright,
-    Metrics
+    Metrics,
+    DNS
   } from '$lib/components/icons'
   import appEnv from 'app-env'
 
@@ -103,6 +104,12 @@
             icon: AP,
             href: '/wifi/ap',
             feature: true
+          },
+          {
+            title: 'mDNS',
+            icon: DNS,
+            href: '/wifi/mdns',
+            feature: true
           }
         ]
       },
diff --git a/app/src/routes/wifi/mdns/+page.svelte b/app/src/routes/wifi/mdns/+page.svelte
new file mode 100644
index 0000000..b0db4a6
--- /dev/null
+++ b/app/src/routes/wifi/mdns/+page.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+  import MDNS from './MDNS.svelte'
+</script>
+
+<div class="mx-0 my-1 flex flex-col space-y-4 sm:mx-8 sm:my-8">
+  <MDNS />
+</div>
diff --git a/app/src/routes/wifi/mdns/MDNS.svelte b/app/src/routes/wifi/mdns/MDNS.svelte
new file mode 100644
index 0000000..56f977b
--- /dev/null
+++ b/app/src/routes/wifi/mdns/MDNS.svelte
@@ -0,0 +1,130 @@
+<script lang="ts">
+  import { onMount } from 'svelte'
+  import { api } from '$lib/api'
+  import SettingsCard from '$lib/components/SettingsCard.svelte'
+  import { AP, Home, MAC, Devices } from '$lib/components/icons'
+  import Spinner from '$lib/components/Spinner.svelte'
+  import StatusItem from '$lib/components/StatusItem.svelte'
+  import { cubicOut } from 'svelte/easing'
+  import { slide } from 'svelte/transition'
+
+  let mdnsStatus: MDNSStatus = $state()
+  let services: MDNSServiceItem[] = $state([])
+  let isLoading = $state(false)
+
+  const getMDNSStatus = async () => {
+    const result = await api.get<MDNSStatus>('/api/mdns/status')
+    if (result.isErr()) {
+      console.error('Error:', result.inner)
+      return
+    }
+    mdnsStatus = result.inner
+  }
+
+  const queryMDNSServices = async () => {
+    isLoading = true
+    const result = await api.post<MDNSServiceQuery>('/api/mdns/query', {
+      service: 'http',
+      protocol: 'tcp'
+    })
+    if (result.isErr()) {
+      console.error('Error:', result.inner)
+      return
+    }
+    services = result.inner.services.sort((a, b) => b.name.localeCompare(a.name))
+    isLoading = false
+  }
+
+  onMount(() => {
+    getMDNSStatus()
+    queryMDNSServices()
+  })
+
+  interface MDNSServiceQuery {
+    services: MDNSServiceItem[]
+  }
+
+  interface MDNSServiceItem {
+    ip: string
+    port: number
+    name: string
+  }
+
+  interface MDNSService {
+    service: string
+    protocol: string
+    port: number
+  }
+
+  interface MDNSTxtRecord {
+    key: string
+    value: string
+  }
+
+  interface MDNSStatus {
+    started: boolean
+    hostname: string
+    instance: string
+    services: MDNSService[]
+    global_txt_records: MDNSTxtRecord[]
+  }
+
+  const triggerScan = async () => {
+    await queryMDNSServices()
+  }
+</script>
+
+<SettingsCard collapsible={false}>
+  {#snippet icon()}
+    <AP class="lex-shrink-0 mr-2 h-6 w-6 self-end" />
+  {/snippet}
+  {#snippet title()}
+    <span>MDNS</span>
+  {/snippet}
+  {#snippet right()}
+    <button class="btn btn-primary" onclick={triggerScan} disabled={isLoading}>
+      {#if isLoading}
+        <span class="loading loading-ring loading-xs"></span>
+      {:else}
+        Scan
+      {/if}
+    </button>
+  {/snippet}
+  <div class="w-full overflow-x-auto">
+    {#await getMDNSStatus()}
+      <Spinner />
+    {:then nothing}
+      <div
+        class="flex w-full flex-col space-y-1"
+        transition:slide|local={{ duration: 300, easing: cubicOut }}>
+        <StatusItem icon={Home} title="IP Address" description={mdnsStatus.hostname} />
+
+        <StatusItem icon={MAC} title="Instance" description={mdnsStatus.instance} />
+
+        <StatusItem icon={Devices} title="Services" description={mdnsStatus.services.length} />
+
+        <table class="table">
+          <thead>
+            <tr>
+              <th></th>
+              <th>Name</th>
+              <th>Ip address</th>
+              <th>Port</th>
+            </tr>
+          </thead>
+          <tbody>
+            {#each services as service}
+              <tr>
+                <td><Devices class="h-6 w-6" /></td>
+                <td>{service.name}</td>
+                <td>{service.ip}</td>
+                <td>{service.port}</td>
+              </tr>
+              <!-- <StatusItem icon={Devices} title={service.name} description={service.port} /> -->
+            {/each}
+          </tbody>
+        </table>
+      </div>
+    {/await}
+  </div>
+</SettingsCard>
diff --git a/app/src/routes/wifi/mdns/MDNSSettings.svelte b/app/src/routes/wifi/mdns/MDNSSettings.svelte
new file mode 100644
index 0000000..059facc
--- /dev/null
+++ b/app/src/routes/wifi/mdns/MDNSSettings.svelte
@@ -0,0 +1,99 @@
+<script lang="ts">
+  import { Cancel, Edit, EditOff, Power } from '$lib/components/icons'
+  import { socket } from '$lib/stores'
+  import type { PeripheralsConfiguration } from '$lib/types/models'
+  import { onMount } from 'svelte'
+  import { modals } from 'svelte-modals'
+  import ConfirmDialog from '$lib/components/ConfirmDialog.svelte'
+
+  let settings: PeripheralsConfiguration | null = $state(null)
+  let isEditing = $state(false)
+
+  onMount(() => {
+    socket.on('peripheralSettings', handleSettings)
+    socket.sendEvent('peripheralSettings', '')
+    return () => socket.off('peripheralSettings', handleSettings)
+  })
+
+  const handleSettings = (data: any) => {
+    settings = data
+  }
+
+  const handleSave = () => {
+    modals.open(ConfirmDialog, {
+      title: 'Confirm configuration',
+      message:
+        'Are you sure you want to save this configuration? The operation cannot be undone. Please make sure you have the correct settings.',
+      labels: {
+        cancel: { label: 'Cancel', icon: Cancel },
+        confirm: { label: 'Confirm', icon: Power }
+      },
+      onConfirm: () => {
+        modals.close()
+        socket.sendEvent('peripheralSettings', settings)
+      }
+    })
+  }
+
+  const Icon = $derived(isEditing ? EditOff : Edit)
+</script>
+
+{#if settings}
+  <div class="collapse bg-base-100 border-base-300 border">
+    <input type="checkbox" />
+    <div class="collapse-title font-semibold">Configuration</div>
+    <div class="collapse-content text-sm">
+      <div class="flex flex-col gap-2">
+        <label for="sda" class="input validator">
+          SDA
+
+          <input
+            id="sda"
+            type="number"
+            required
+            placeholder="Type a number between 1 to 48"
+            min="0"
+            max="48"
+            title="SDA pin number (0-48)"
+            disabled={!isEditing}
+            bind:value={settings.sda} />
+        </label>
+        <label for="scl" class="input validator">
+          SCL
+
+          <input
+            id="scl"
+            type="number"
+            required
+            placeholder="Type a number between 1 to 48"
+            min="1"
+            max="48"
+            title="SCL pin number (0-48)"
+            disabled={!isEditing}
+            bind:value={settings.scl} />
+        </label>
+        <label class="input validator" for="frequency">
+          Frequency
+          <input
+            id="frequency"
+            type="number"
+            required
+            placeholder="Type a number between 100000 to 430000"
+            min="100000"
+            max="430000"
+            title="I2C frequency in Hz"
+            disabled={!isEditing}
+            bind:value={settings.frequency} />
+        </label>
+        <div>
+          <button class="btn btn-outline btn-primary" onclick={() => (isEditing = !isEditing)}>
+            <Icon class="h-6 w-6" />
+          </button>
+          {#if isEditing}
+            <button class="btn btn-outline btn-primary" onclick={handleSave}>Save</button>
+          {/if}
+        </div>
+      </div>
+    </div>
+  </div>
+{/if}
diff --git a/esp32/lib/ESP32-sveltekit/filesystem.h b/esp32/lib/ESP32-sveltekit/filesystem.h
index d7e23e6..3fdbb4f 100644
--- a/esp32/lib/ESP32-sveltekit/filesystem.h
+++ b/esp32/lib/ESP32-sveltekit/filesystem.h
@@ -12,6 +12,7 @@
 #define DEVICE_CONFIG_FILE "/config/peripheral.json"
 #define WIFI_SETTINGS_FILE "/config/wifiSettings.json"
 #define SERVO_SETTINGS_FILE "/config/servoSettings.json"
+#define MDNS_SETTINGS_FILE "/config/mdnsSettings.json"
 
 namespace FileSystem {
 extern PsychicUploadHandler *uploadHandler;
diff --git a/esp32/lib/ESP32-sveltekit/mdns_service.cpp b/esp32/lib/ESP32-sveltekit/mdns_service.cpp
new file mode 100644
index 0000000..92367d5
--- /dev/null
+++ b/esp32/lib/ESP32-sveltekit/mdns_service.cpp
@@ -0,0 +1,101 @@
+#include <mdns_service.h>
+
+static const char *TAG = "MDNSService";
+
+MDNSService::MDNSService()
+    : endpoint(MDNSSettings::read, MDNSSettings::update, this),
+      _persistence(MDNSSettings::read, MDNSSettings::update, this, MDNS_SETTINGS_FILE),
+      _started(false) {
+    addUpdateHandler([&](const String &originId) { reconfigureMDNS(); }, false);
+}
+
+MDNSService::~MDNSService() {
+    if (_started) {
+        stopMDNS();
+    }
+}
+
+void MDNSService::begin() {
+    _persistence.readFromFS();
+    startMDNS();
+}
+
+void MDNSService::reconfigureMDNS() {
+    if (_started) {
+        stopMDNS();
+    }
+    startMDNS();
+}
+
+void MDNSService::startMDNS() {
+    ESP_LOGV(TAG, "Starting MDNS with hostname: %s", state().hostname.c_str());
+
+    if (MDNS.begin(state().hostname.c_str())) {
+        _started = true;
+        MDNS.setInstanceName(state().instance.c_str());
+
+        addServices();
+
+        ESP_LOGI(TAG, "MDNS started successfully with hostname: %s", state().hostname.c_str());
+    } else {
+        _started = false;
+        ESP_LOGE(TAG, "Failed to start MDNS");
+    }
+}
+
+void MDNSService::stopMDNS() {
+    ESP_LOGV(TAG, "Stopping MDNS");
+    MDNS.end();
+    _started = false;
+}
+
+void MDNSService::addServices() {
+    for (const auto &service : state().services) {
+        MDNS.addService(service.service.c_str(), service.protocol.c_str(), service.port);
+
+        for (const auto &txt : service.txtRecords) {
+            MDNS.addServiceTxt(service.service.c_str(), service.protocol.c_str(), txt.key.c_str(), txt.value.c_str());
+        }
+    }
+
+    for (const auto &txt : state().globalTxtRecords) {
+        for (const auto &service : state().services) {
+            MDNS.addServiceTxt(service.service.c_str(), service.protocol.c_str(), txt.key.c_str(), txt.value.c_str());
+        }
+    }
+}
+
+esp_err_t MDNSService::getStatus(PsychicRequest *request) {
+    PsychicJsonResponse response = PsychicJsonResponse(request, false);
+    JsonObject root = response.getRoot();
+    getStatus(root);
+    return response.send();
+}
+
+void MDNSService::getStatus(JsonObject &root) {
+    state().read(state(), root);
+    root["started"] = _started;
+}
+
+esp_err_t MDNSService::queryServices(PsychicRequest *request, JsonVariant &json) {
+    String service = json["service"].as<String>();
+    String proto = json["protocol"].as<String>();
+
+    PsychicJsonResponse response = PsychicJsonResponse(request, false);
+    JsonObject root = response.getRoot();
+
+    ESP_LOGI(TAG, "Querying for service: %s, protocol: %s", service.c_str(), proto.c_str());
+
+    int n = MDNS.queryService(service.c_str(), proto.c_str());
+    ESP_LOGI(TAG, "Found %d services", n);
+
+    JsonArray servicesArray = root["services"].to<JsonArray>();
+    for (int i = 0; i < n; i++) {
+        JsonObject serviceObj = servicesArray.add<JsonObject>();
+        serviceObj["name"] = MDNS.hostname(i);
+        serviceObj["ip"] = MDNS.IP(i);
+        serviceObj["port"] = MDNS.port(i);
+    }
+
+    return response.send();
+}
diff --git a/esp32/lib/ESP32-sveltekit/mdns_service.h b/esp32/lib/ESP32-sveltekit/mdns_service.h
new file mode 100644
index 0000000..4800853
--- /dev/null
+++ b/esp32/lib/ESP32-sveltekit/mdns_service.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <PsychicHttp.h>
+#include <ESPmDNS.h>
+#include <template/stateful_service.h>
+#include <template/stateful_endpoint.h>
+#include <template/stateful_persistence.h>
+#include <settings/mdns_settings.h>
+#include <utils/timing.h>
+
+class MDNSService : public StatefulService<MDNSSettings> {
+  private:
+    FSPersistence<MDNSSettings> _persistence;
+    bool _started;
+
+    void reconfigureMDNS();
+    void startMDNS();
+    void stopMDNS();
+    void addServices();
+
+  public:
+    MDNSService();
+    ~MDNSService();
+
+    void begin();
+
+    esp_err_t getStatus(PsychicRequest *request);
+    void getStatus(JsonObject &root);
+
+    static esp_err_t queryServices(PsychicRequest *request, JsonVariant &json);
+
+    StatefulHttpEndpoint<MDNSSettings> endpoint;
+};
\ No newline at end of file
diff --git a/esp32/lib/ESP32-sveltekit/settings/mdns_settings.h b/esp32/lib/ESP32-sveltekit/settings/mdns_settings.h
new file mode 100644
index 0000000..3dbbaa6
--- /dev/null
+++ b/esp32/lib/ESP32-sveltekit/settings/mdns_settings.h
@@ -0,0 +1,139 @@
+#pragma once
+
+#include <ArduinoJson.h>
+#include <utils/json_utils.h>
+#include <utils/string_utils.h>
+#include <template/state_result.h>
+#include <filesystem.h>
+
+#ifndef FACTORY_MDNS_HOSTNAME
+#define FACTORY_MDNS_HOSTNAME "esp32"
+#endif
+
+#ifndef FACTORY_MDNS_INSTANCE
+#define FACTORY_MDNS_INSTANCE "ESP32 Device"
+#endif
+
+typedef struct {
+    String key;
+    String value;
+
+    void serialize(JsonObject &json) const {
+        json["key"] = key;
+        json["value"] = value;
+    }
+
+    bool deserialize(const JsonObject &json) {
+        key = json["key"].as<String>();
+        value = json["value"].as<String>();
+
+        return key.length() > 0;
+    }
+} mdns_txt_record_t;
+
+typedef struct {
+    String service;
+    String protocol;
+    uint16_t port;
+    std::vector<mdns_txt_record_t> txtRecords;
+
+    void serialize(JsonObject &json) const {
+        json["service"] = service;
+        json["protocol"] = protocol;
+        json["port"] = port;
+
+        if (txtRecords.size() > 0) {
+            JsonArray txtArray = json["txt_records"].to<JsonArray>();
+            for (const auto &txt : txtRecords) {
+                JsonObject txtObj = txtArray.add<JsonObject>();
+                txt.serialize(txtObj);
+            }
+        }
+    }
+
+    bool deserialize(const JsonObject &json) {
+        service = json["service"].as<String>();
+        protocol = json["protocol"].as<String>();
+        port = json["port"] | 0;
+
+        txtRecords.clear();
+        if (json["txt_records"].is<JsonArray>()) {
+            JsonArray txtArray = json["txt_records"];
+            for (JsonObject txtObj : txtArray) {
+                mdns_txt_record_t txt;
+                if (txt.deserialize(txtObj)) {
+                    txtRecords.push_back(txt);
+                }
+            }
+        }
+
+        return service.length() > 0 && protocol.length() > 0 && port > 0;
+    }
+} mdns_service_t;
+
+class MDNSSettings {
+  public:
+    String hostname;
+    String instance;
+    std::vector<mdns_service_t> services;
+    std::vector<mdns_txt_record_t> globalTxtRecords;
+
+    static void read(MDNSSettings &settings, JsonObject &root) {
+        root["hostname"] = settings.hostname;
+        root["instance"] = settings.instance;
+
+        JsonArray servicesArray = root["services"].to<JsonArray>();
+        for (const auto &service : settings.services) {
+            JsonObject serviceObj = servicesArray.add<JsonObject>();
+            service.serialize(serviceObj);
+        }
+
+        JsonArray txtArray = root["global_txt_records"].to<JsonArray>();
+        for (const auto &txt : settings.globalTxtRecords) {
+            JsonObject txtObj = txtArray.add<JsonObject>();
+            txt.serialize(txtObj);
+        }
+    }
+
+    static StateUpdateResult update(JsonObject &root, MDNSSettings &settings) {
+        settings.hostname = root["hostname"] | FACTORY_MDNS_HOSTNAME;
+        settings.instance = root["instance"] | FACTORY_MDNS_INSTANCE;
+
+        settings.services.clear();
+        if (root["services"].is<JsonArray>()) {
+            JsonArray servicesArray = root["services"];
+            for (JsonObject serviceObj : servicesArray) {
+                mdns_service_t service;
+                if (service.deserialize(serviceObj)) {
+                    settings.services.push_back(service);
+                }
+            }
+        }
+
+        if (settings.services.empty()) {
+            mdns_service_t httpService = {.service = "http", .protocol = "tcp", .port = 80};
+            settings.services.push_back(httpService);
+
+            mdns_service_t wsService = {.service = "ws", .protocol = "tcp", .port = 80};
+            settings.services.push_back(wsService);
+        }
+
+        settings.globalTxtRecords.clear();
+        if (root["global_txt_records"].is<JsonArray>()) {
+            JsonArray txtArray = root["global_txt_records"];
+            for (JsonObject txtObj : txtArray) {
+                mdns_txt_record_t txt;
+                if (txt.deserialize(txtObj)) {
+                    settings.globalTxtRecords.push_back(txt);
+                }
+            }
+        }
+
+        if (settings.globalTxtRecords.empty()) {
+            mdns_txt_record_t firmwareVersion = {.key = "Firmware Version", .value = APP_VERSION};
+            settings.globalTxtRecords.push_back(firmwareVersion);
+        }
+
+        return StateUpdateResult::CHANGED;
+    }
+};
\ No newline at end of file
diff --git a/esp32/src/spot.cpp b/esp32/src/spot.cpp
index 95dd63a..ce13f06 100644
--- a/esp32/src/spot.cpp
+++ b/esp32/src/spot.cpp
@@ -26,8 +26,6 @@ void Spot::initialize() {
 
     startServices();
 
-    setupMDNS();
-
     ESP_LOGV(TAG, "Starting misc loop task");
     g_taskManager.createTask(this->_loopImpl, "Spot misc", 4096, this, 2, NULL, APPLICATION_CORE);
 }
@@ -108,6 +106,16 @@ void Spot::setupServer() {
     });
 #endif
 
+    // MDNS
+    _server.on("/api/mdns/status", HTTP_GET,
+               [this](PsychicRequest *request) { return _mdnsService.getStatus(request); });
+    _server.on("/api/mdns/settings", HTTP_GET,
+               [this](PsychicRequest *request) { return _mdnsService.endpoint.getState(request); });
+    _server.on("/api/mdns/settings", HTTP_POST, [this](PsychicRequest *request, JsonVariant &json) {
+        return _mdnsService.endpoint.handleStateUpdate(request, json);
+    });
+    _server.on("/api/mdns/query", HTTP_POST, MDNSService::queryServices);
+
 #ifdef EMBED_WWW
     ESP_LOGV(TAG, "Registering routes from PROGMEM static resources");
     WWWData::registerRoutes([&](const String &uri, const String &contentType, const uint8_t *content, size_t len) {
@@ -158,15 +166,6 @@ void Spot::setupServer() {
     DefaultHeaders::Instance().addHeader("Server", _appName);
 }
 
-void Spot::setupMDNS() {
-    ESP_LOGV(TAG, "Starting MDNS");
-    MDNS.begin(_wifiService.getHostname());
-    MDNS.setInstanceName(_appName);
-    MDNS.addService("http", "tcp", _port);
-    MDNS.addService("ws", "tcp", _port);
-    MDNS.addServiceTxt("http", "tcp", "Firmware Version", APP_VERSION);
-}
-
 void Spot::startServices() {
     _apService.begin();
 #if FT_ENABLED(USE_UPLOAD_FIRMWARE)
@@ -180,6 +179,7 @@ void Spot::startServices() {
 #if FT_ENABLED(USE_CAMERA)
     _cameraService.begin();
 #endif
+    _mdnsService.begin();
 }
 
 void IRAM_ATTR Spot::loop() {