add user's display-name to peer view (#525 )

2025-10-07 00:46:18 +00:00 · 2025-09-21 12:41:11 +02:00
45 changed files with 1467 additions and 2331 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-github: h44z # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
--- a/2
+++ b/2
@@ -52,7 +52,7 @@ COPY --from=builder /build/dist/wg-portal /
 ######
 FROM alpine:3.22
 # Install OS-level dependencies
-RUN apk add --no-cache bash curl iptables nftables openresolv wireguard-tools tzdata
+RUN apk add --no-cache bash curl iptables nftables openresolv wireguard-tools
 # Setup timezone
 ENV TZ=UTC
 # Copy binaries
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2020-2025 Christoph Haas
+Copyright (c) 2020-2023 Christoph Haas

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ The configuration portal supports using a database (SQLite, MySQL, MsSQL, or Pos
 ## Features

 * Self-hosted - the whole application is a single binary
-* Responsive multi-language web UI with dark-mode written in Vue.js
+* Responsive multi-language web UI written in Vue.js
 * Automatically selects IP from the network pool assigned to the client
 * QR-Code for convenient mobile client configuration
 * Sends email to the client with QR-code and client config
@@ -32,7 +32,7 @@ The configuration portal supports using a database (SQLite, MySQL, MsSQL, or Pos
 * Docker ready
 * Can be used with existing WireGuard setups
 * Support for multiple WireGuard interfaces
-* Supports multiple WireGuard backends (wgctrl or MikroTik)
+* Supports multiple WireGuard backends (wgctrl or MikroTik [BETA])
 * Peer Expiry Feature
 * Handles route and DNS settings like wg-quick does
 * Exposes Prometheus metrics for monitoring and alerting
@@ -62,17 +62,6 @@ For the complete documentation visit [wgportal.org](https://wgportal.org).

 * MIT License. [MIT](LICENSE.txt) or <https://opensource.org/licenses/MIT>

-## Contributors and Sponsors
-
-Thanks so much for all your contributions! They’re truly appreciated and help keep WireGuard Portal moving ahead.
-
-<a href="https://github.com/h44z/wg-portal/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=h44z/wg-portal" />
-</a>
-
-Want to support the project? You can buy me a coffee or join as a contributor - every bit of support helps! 
-[Become a sponsor!](https://github.com/sponsors/h44z)
-

 > [!IMPORTANT]
 > Since the project was accepted by the Docker-Sponsored Open Source Program, the Docker image location has moved to [wgportal/wg-portal](https://hub.docker.com/r/wgportal/wg-portal).
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,7 +7,7 @@ If you believe you've found a security issue in one of the supported versions of
 | Version | Supported          |
 |---------|--------------------|
 | v2.x    | :white_check_mark: |
-| v1.x    | :x:                |
+| v1.x    | :white_check_mark: |

 ## Reporting a Vulnerability

--- a/cmd/wg-portal/main.go
+++ b/cmd/wg-portal/main.go
@@ -53,6 +53,8 @@ func main() {
 	wireGuard, err := wireguard.NewControllerManager(cfg)
 	internal.AssertNoError(err)

+	wgQuick := adapters.NewWgQuickRepo()
+
 	mailer := adapters.NewSmtpMailRepo(cfg.Mail)

 	metricsServer := adapters.NewMetricsServer(cfg)
@@ -91,7 +93,7 @@ func main() {
 	webAuthn, err := auth.NewWebAuthnAuthenticator(cfg, eventBus, userManager)
 	internal.AssertNoError(err)

-	wireGuardManager, err := wireguard.NewWireGuardManager(cfg, eventBus, wireGuard, database)
+	wireGuardManager, err := wireguard.NewWireGuardManager(cfg, eventBus, wireGuard, wgQuick, database)
 	internal.AssertNoError(err)
 	wireGuardManager.StartBackgroundJobs(ctx)

@@ -105,7 +107,7 @@ func main() {
 	mailManager, err := mail.NewMailManager(cfg, mailer, cfgFileManager, database, database)
 	internal.AssertNoError(err)

-	routeManager, err := route.NewRouteManager(cfg, eventBus, database, wireGuard)
+	routeManager, err := route.NewRouteManager(cfg, eventBus, database)
 	internal.AssertNoError(err)
 	routeManager.StartBackgroundJobs(ctx)

--- a/docs/assets/images/wgportal_dark.png
+++ b/docs/assets/images/wgportal_dark.png
--- a/docs/assets/images/wgportal_light.png
+++ b/docs/assets/images/wgportal_light.png
--- a/docs/documentation/configuration/examples.md
+++ b/docs/documentation/configuration/examples.md
@@ -15,9 +15,6 @@ backend:
  # default backend decides where new interfaces are created
  default: mikrotik

-  # A prefix for resolvconf. Usually it is "tun.". If you are using systemd, the prefix should be empty.
-  local_resolvconf_prefix: "tun."
-
  mikrotik:
    - id: mikrotik                   # unique id, not "local"
      display_name: RouterOS RB5009  # optional nice name
--- a/docs/documentation/configuration/overview.md
+++ b/docs/documentation/configuration/overview.md
@@ -28,7 +28,6 @@ core:
  
 backend:
  default: local
-  local_resolvconf_prefix: tun.

 advanced:
  log_level: info
@@ -185,11 +184,6 @@ The current MikroTik backend is in **BETA** and may not support all features.
 - **Description:** The default backend to use for managing WireGuard interfaces. 
  Valid options are: `local`, or other backend id's configured in the `mikrotik` section.

-### `local_resolvconf_prefix`
- **Default:** `tun.`
- **Description:** Interface name prefix for WireGuard interfaces on the local system which is used to configure DNS servers with *resolvconf*. 
-  It depends on the *resolvconf* implementation you are using, most use a prefix of `tun.`, but some have an empty prefix (e.g., systemd).
-
 ### `ignored_local_interfaces`
 - **Default:** *(empty)*
 - **Description:** A list of interface names to exclude when enumerating local interfaces.
--- a/docs/javascript/img-comparison-slider.js
+++ b/docs/javascript/img-comparison-slider.js
--- a/docs/javascript/img-comparison-slider.js.map
+++ b/docs/javascript/img-comparison-slider.js.map
--- a/docs/stylesheets/img-comparison-slider.css
+++ b/docs/stylesheets/img-comparison-slider.css
@@ -1,15 +0,0 @@
-img-comparison-slider {
-  visibility: hidden;
-}
-
-img-comparison-slider [slot='second'] {
-  display: none;
-}
-
-img-comparison-slider.rendered {
-  visibility: inherit;
-}
-
-img-comparison-slider.rendered [slot='second'] {
-  display: unset;
-}
--- a/docs/theme-overrides/layouts/home.html
+++ b/docs/theme-overrides/layouts/home.html
@@ -300,59 +300,6 @@
  background: var(--md-accent-fg-color--transparent);
 }

-.before,
-.after {
-    margin: 0;
-}
-
-.after figcaption {
-    background: #fff;
-    font-weight: bold;
-    border: 1px solid #c0c0c0;
-    color: #000000;
-    opacity: 0.9;
-    padding: 9px;
-    position: absolute;
-    top: 100%;
-    transform: translateY(-100%);
-    line-height: 100%;
-}
-
-.before figcaption {
-    background: #000;
-    font-weight: bold;
-    border: 1px solid #c0c0c0;
-    color: #ffffff;
-    opacity: 0.9;
-    padding: 9px;
-    position: absolute;
-    top: 100%;
-    transform: translateY(-100%);
-    line-height: 100%;
-}
-
-.before figcaption {
-    left: 0px;
-}
-.after figcaption {
-    right: 0px;
-}
-.custom-animated-handle {
-    transition: transform 0.2s;
-}
-
-.slider-with-animated-handle:hover .custom-animated-handle {
-    transform: scale(1.2);
-}
-.md-typeset img-comparison-slider figure {
-    margin: initial;
-}
-
-.first-overlay {
-    color: #000;
-}
-
-
 </style>

  <!-- Hero for landing page -->
@@ -379,34 +326,11 @@

  <div class="md-container">
    <div class="tx-hero__image">
-      <div>
-        <img-comparison-slider hover="hover">
-          <figure slot="first" class="before">
-            <img src="{{config.site_url}}/assets/images/wgportal_light.png" alt="Light Mode"/>
-            <figcaption>Light Mode</figcaption>
-          </figure>
-          <figure slot="second" class="after">
-            <img src="{{config.site_url}}/assets/images/wgportal_dark.png" alt="Dark Mode"/>
-            <figcaption>Dark Mode</figcaption>
-          </figure>
-          <svg slot="handle" class="custom-animated-handle" xmlns="http://www.w3.org/2000/svg" width="100" viewBox="-8 -3 16 6">
-                <!-- Left arrow (dark) -->
-                <path d="M -5 -2 L -7 0 L -5 2 M -5 -2 L -5 2"
-                      stroke="#1a1a1a"
-                      fill="#1a1a1a"
-                      stroke-width="1"
-                      vector-effect="non-scaling-stroke">
-                </path>
-                <!-- Right arrow (white) -->
-                <path d="M 5 -2 L 7 0 L 5 2 M 5 -2 L 5 2"
-                      stroke="#fff"
-                      fill="#fff"
-                      stroke-width="1"
-                      vector-effect="non-scaling-stroke">
-                </path>
-          </svg>
-        </img-comparison-slider>
-      </div>
+      <img
+        src="{{config.site_url}}/assets/images/screenshot.png"
+        alt=""
+        draggable="false"
+      >
    </div>
  </div>

--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -30,6 +30,6 @@
  "devDependencies": {
    "@vitejs/plugin-vue": "^5.2.3",
    "sass-embedded": "^1.86.3",
-    "vite": "^6.3.6"
+    "vite": "6.3.4"
  }
 }
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -63,7 +63,6 @@ const languageFlag = computed(() => {
    uk: "ua",
    zh: "cn",
    ko: "kr",
-    es: "es",

  };
  return "fi-" + (langMap[lang] || lang);
@@ -183,7 +182,6 @@ const userDisplayName = computed(() => {
                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('uk')"><span class="fi fi-ua"></span> Українська</a>
                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('vi')"><span class="fi fi-vi"></span> Tiếng Việt</a>
                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('zh')"><span class="fi fi-cn"></span> 中文</a>
-                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('es')"><span class="fi fi-es"></span> Español</a>
                
              </div>
            </div>
--- a/frontend/src/assets/base.css
+++ b/frontend/src/assets/base.css
@@ -104,8 +104,4 @@ a.disabled {

 .vue-tags-input .ti-deletion-mark:after {
  transform: scaleX(1);
-}
-
-.modal-dialog {
-    box-shadow: none;
 }
--- a/frontend/src/components/PeerEditModal.vue
+++ b/frontend/src/components/PeerEditModal.vue
@@ -358,7 +358,7 @@ async function del() {
          <input type="text" class="form-control" :placeholder="$t('modals.peer-edit.endpoint.placeholder')"
            v-model="formData.Endpoint.Value">
        </div>
-        <div class="form-group" v-if="selectedInterface.Mode !== 'client'">
+        <div class="form-group">
          <label class="form-label mt-4">{{ $t('modals.peer-edit.ip.label') }}</label>
          <vue-tags-input class="form-control" v-model="currentTags.Addresses"
                           :tags="formData.Addresses.map(str => ({ text: str }))"
--- a/frontend/src/components/PeerViewModal.vue
+++ b/frontend/src/components/PeerViewModal.vue
@@ -130,7 +130,7 @@ function ConfigQrUrl() {
 <template>
  <Modal :title="title" :visible="visible" @close="close">
    <template #default>
-      <div class="d-flex justify-content-end align-items-center mb-1" v-if="selectedInterface.Mode !== 'client'">
+      <div class="d-flex justify-content-end align-items-center mb-1">
        <span class="me-2">{{ $t('modals.peer-view.style-label') }}: </span>
        <div class="btn-group btn-switch-group" role="group" aria-label="Configuration Style">
          <input type="radio" class="btn-check" name="configstyle" id="raw" value="raw" autocomplete="off" checked="" v-model="configStyle">
@@ -151,28 +151,20 @@ function ConfigQrUrl() {
            data-bs-parent="#peerInformation" style="">
            <div class="accordion-body">
              <div class="row">
-                <div :class="{ 'col-md-8': selectedInterface.Mode !== 'client',  'col-md-12': selectedInterface.Mode !== 'server' }" class="col-md-8">
+                <div class="col-md-8">
                  <ul>
-                    <li v-if="selectedInterface.Mode !== 'client'"><strong>{{ $t('modals.peer-view.identifier') }}</strong>: {{ selectedPeer.PublicKey }}</li>
-                    <li v-if="selectedInterface.Mode !== 'server'"><strong>{{ $t('modals.peer-view.endpoint-key') }}</strong>: {{ selectedPeer.PublicKey }}</li>
-                    <li v-if="selectedInterface.Mode !== 'server'"><strong>{{ $t('modals.peer-view.endpoint') }}</strong>: {{ selectedPeer.Endpoint.Value }}</li>
-                    <li v-if="selectedInterface.Mode !== 'client'"><strong>{{ $t('modals.peer-view.ip') }}</strong>: <span v-for="ip in selectedPeer.Addresses" :key="ip"
+                    <li>{{ $t('modals.peer-view.identifier') }}: {{ selectedPeer.PublicKey }}</li>
+                    <li>{{ $t('modals.peer-view.ip') }}: <span v-for="ip in selectedPeer.Addresses" :key="ip"
                        class="badge rounded-pill bg-light">{{ ip }}</span></li>
-                    <li v-if="selectedInterface.Mode === 'server'"><strong>{{ $t('modals.peer-view.extra-allowed-ip') }}</strong>: <span v-for="ip in selectedPeer.ExtraAllowedIPs" :key="ip"
-                                                                                                                        class="badge rounded-pill bg-light">{{ ip }}</span></li>
-                    <li v-if="selectedInterface.Mode !== 'server' && selectedPeer.AllowedIPs.Value"><strong>{{ $t('modals.peer-view.allowed-ip') }}</strong>: <span v-for="ip in selectedPeer.AllowedIPs.Value" :key="ip"
-                                                                                                          class="badge rounded-pill bg-light">{{ ip }}</span></li>
-                    <li v-if="selectedInterface.Mode !== 'server'"><strong>{{ $t('modals.peer-view.keepalive') }}</strong>: {{ selectedPeer.PersistentKeepalive.Value }}</li>
-                    <li v-if="selectedPeer.UserDisplayName"><strong>{{ $t('modals.peer-view.user') }}</strong>: {{ selectedPeer.UserDisplayName }} ({{ selectedPeer.UserIdentifier }})</li>
-                    <li v-else><strong>{{ $t('modals.peer-view.user') }}</strong>: {{ selectedPeer.UserIdentifier }}</li>
-                    <li v-if="selectedPeer.Notes"><strong>{{ $t('modals.peer-view.notes') }}</strong>: {{ selectedPeer.Notes }}</li>
-                    <li v-if="selectedPeer.ExpiresAt"><strong>{{ $t('modals.peer-view.expiry-status') }}</strong>: {{
+                    <li>{{ $t('modals.peer-view.user') }}: {{ selectedPeer.UserIdentifier }}</li>
+                    <li v-if="selectedPeer.Notes">{{ $t('modals.peer-view.notes') }}: {{ selectedPeer.Notes }}</li>
+                    <li v-if="selectedPeer.ExpiresAt">{{ $t('modals.peer-view.expiry-status') }}: {{
                      selectedPeer.ExpiresAt }}</li>
-                    <li v-if="selectedPeer.Disabled"><strong>{{ $t('modals.peer-view.disabled-status') }}</strong>: {{
+                    <li v-if="selectedPeer.Disabled">{{ $t('modals.peer-view.disabled-status') }}: {{
                      selectedPeer.DisabledReason }}</li>
                  </ul>
                </div>
-                <div class="col-md-4" v-if="selectedInterface.Mode !== 'client'">
+                <div class="col-md-4">
                  <img class="config-qr-img" :src="ConfigQrUrl()" loading="lazy" alt="Configuration QR Code">
                </div>
              </div>
@@ -207,7 +199,7 @@ function ConfigQrUrl() {
            </div>
          </div>
        </div>
-        <div v-if="selectedInterface.Mode !== 'client'" class="accordion-item">
+        <div v-if="selectedInterface.Mode === 'server'" class="accordion-item">
          <h2 class="accordion-header" id="headingConfig">
            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
              data-bs-target="#collapseConfig" aria-expanded="false" aria-controls="collapseConfig">
@@ -225,9 +217,9 @@ function ConfigQrUrl() {
    </template>
    <template #footer>
      <div class="flex-fill text-start">
-        <button v-if="selectedInterface.Mode !== 'client'" @click.prevent="download" type="button" class="btn btn-primary me-1">{{
+        <button @click.prevent="download" type="button" class="btn btn-primary me-1">{{
          $t('modals.peer-view.button-download') }}</button>
-        <button v-if="selectedInterface.Mode !== 'client'" @click.prevent="email" type="button" class="btn btn-primary me-1">{{
+        <button @click.prevent="email" type="button" class="btn btn-primary me-1">{{
          $t('modals.peer-view.button-email') }}</button>
      </div>
      <button @click.prevent="close" type="button" class="btn btn-secondary">{{ $t('general.close') }}</button>
--- a/frontend/src/lang/index.js
+++ b/frontend/src/lang/index.js
@@ -8,7 +8,6 @@ import ru from './translations/ru.json';
 import uk from './translations/uk.json';
 import vi from './translations/vi.json';
 import zh from './translations/zh.json';
-import es from './translations/es.json';

 import {createI18n} from "vue-i18n";

@@ -33,7 +32,6 @@ const i18n = createI18n({
    "uk": uk,
    "vi": vi,
    "zh": zh,
-    "es": es,    
  }
 });

--- a/frontend/src/lang/translations/de.json
+++ b/frontend/src/lang/translations/de.json
@@ -117,7 +117,6 @@
      "dns": "DNS-Server",
      "mtu": "MTU",
      "default-keep-alive": "Standard Keepalive-Intervall",
-      "default-dns": "Standard DNS-Server",
      "button-show-config": "Konfiguration anzeigen",
      "button-download-config": "Konfiguration herunterladen",
      "button-store-config": "Konfiguration für wg-quick speichern",
@@ -462,8 +461,6 @@
      "section-config": "Konfiguration",
      "identifier": "Kennung",
      "ip": "IP-Adressen",
-      "allowed-ip": "Erlaubte IP-Adressen",
-      "extra-allowed-ip": "Serverseitig erlaubte IP-Adressen",
      "user": "Zugeordneter Benutzer",
      "notes": "Notizen",
      "expiry-status": "Läuft ab am",
@@ -476,8 +473,6 @@
      "handshake": "Letzter Handshake",
      "connected-since": "Verbunden seit",
      "endpoint": "Endpunkt",
-      "endpoint-key": "Öffentlicher Endpunkt-Schlüssel",
-      "keepalive": "Persistentes Keepalive",
      "button-download": "Konfiguration herunterladen",
      "button-email": "Konfiguration per E-Mail senden",
      "style-label": "Konfigurationsformat"
--- a/frontend/src/lang/translations/en.json
+++ b/frontend/src/lang/translations/en.json
@@ -117,7 +117,6 @@
      "dns": "DNS Servers",
      "mtu": "MTU",
      "default-keep-alive": "Default Keepalive Interval",
-      "default-dns": "Default DNS Servers",
      "button-show-config": "Show configuration",
      "button-download-config": "Download configuration",
      "button-store-config": "Store configuration for wg-quick",
@@ -463,8 +462,6 @@
      "section-config": "Configuration",
      "identifier": "Identifier",
      "ip": "IP Addresses",
-      "allowed-ip": "Allowed IP Addresses",
-      "extra-allowed-ip": "Server Side Allowed IP Addresses",
      "user": "Associated User",
      "notes": "Notes",
      "expiry-status": "Expires At",
@@ -477,8 +474,6 @@
      "handshake": "Last Handshake",
      "connected-since": "Connected since",
      "endpoint": "Endpoint",
-      "endpoint-key": "Endpoint Public Key",
-      "keepalive": "Persistent Keepalive",
      "button-download": "Download configuration",
      "button-email": "Send configuration via E-Mail",
      "style-label": "Configuration Style"
--- a/frontend/src/lang/translations/es.json
+++ b/frontend/src/lang/translations/es.json
@@ -1,587 +0,0 @@
-{
-  "languages": {
-    "es": "Español"
-  },
-  "general": {
-    "pagination": {
-      "size": "Numero de elementos",
-      "all": "Todos (Lento)"
-    },
-    "search": {
-      "placeholder": "Buscar...",
-      "button": "Buscar"
-    },
-    "select-all": "Buscar todos",
-    "yes": "Sí",
-    "no": "No",
-    "cancel": "Cancelar",
-    "close": "Cerrar",
-    "save": "Guardar",
-    "delete": "Eliminar"
-  },
-  "login": {
-    "headline": "Por favor inicie sesión",
-    "username": {
-      "label": "Usuario",
-      "placeholder": "Por favor ingrese su usuario"
-    },
-    "password": {
-      "label": "Contraseña",
-      "placeholder": "Por favor ingrese su contraseña"
-    },
-    "button": "Ingresar",
-    "button-webauthn": "Usar clave de acceso"
-  },
-  "menu": {
-    "home": "Inicio",
-    "interfaces": "Interfaces",
-    "users": "Usuarios",
-    "lang": "Cambiar idioma",
-    "profile": "Mi perfil",
-    "settings": "Configuración",
-    "audit": "Registro de auditoría",
-    "login": "Iniciar sesión",
-    "logout": "Cerrar sesión",
-    "keygen": "Generador de claves"
-  },
-  "home": {
-    "headline": "Portal VPN WireGuard®",
-    "info-headline": "Más información",
-    "abstract": "WireGuard® es una VPN extremadamente simple pero rápida y moderna que utiliza criptografía de última generación. Su objetivo es ser más rápida, simple, ligera y útil que IPsec, a la vez que evita los enormes problemas que supone. Su objetivo es ofrecer un rendimiento considerablemente superior al de OpenVPN.",
-    "installation": {
-      "box-header": "Instalación de WireGuard",
-      "headline": "Instalación",
-      "content": "Las instrucciones de instalación del cliente se pueden encontrar en el sitio web oficial de WireGuard.",
-      "button": "Abrir instrucciones"
-    },
-    "about-wg": {
-      "box-header": "Acerca de WireGuard",
-      "headline": "Acerca de",
-      "content": "WireGuard® es una VPN extremadamente simple pero rápida y moderna que utiliza criptografía de última generación.",
-      "button": "Más"
-    },
-    "about-portal": {
-      "box-header": "Acerca del Portal WireGuard",
-      "headline": "Portal WireGuard",
-      "content": "WireGuard Portal es un portal web simple para la configuración de WireGuard.",
-      "button": "Más"
-    },
-    "profiles": {
-      "headline": "Perfiles VPN",
-      "abstract": "Puedes acceder y descargar tus configuraciones personales de VPN desde tu perfil de usuario.",
-      "content": "para ver todos tus perfiles configurados, haz clic en el botón de abajo.",
-      "button": "Abrir mi perfil"
-    },
-    "admin": {
-      "headline": "Área de administración",
-      "abstract": "En el área de administración puedes gestionar los peers de WireGuard, la interfaz del servidor, así como los usuarios que tienen acceso al Portal WireGuard.",
-      "content": "",
-      "button-admin": "Abrir administración del servidor",
-      "button-user": "Abrir administración de usuarios"
-    }
-  },
-  "interfaces": {
-    "headline": "Administración de interfaces",
-    "headline-peers": "Peers VPN actuales",
-    "headline-endpoints": "Extremos actuales",
-    "no-interface": {
-      "default-selection": "No hay interfaces disponibles",
-      "headline": "No se encontraron interfaces...",
-      "abstract": "Haz clic en el botón + para crear una nueva interfaz WireGuard."
-    },
-    "no-peer": {
-      "headline": "No hay peers disponibles",
-      "abstract": "Actualmente no hay peers disponibles para la interfaz WireGuard seleccionada."
-    },
-    "table-heading": {
-      "name": "Nombre",
-      "user": "Usuario",
-      "ip": "IP's",
-      "endpoint": "Endpoint",
-      "status": "Estado"
-    },
-    "interface": {
-      "headline": "Estado de la interfaz para",
-      "backend": "Backend",
-      "unknown-backend": "Desconocido",
-      "wrong-backend": "Backend inválido, usando backend local de WireGuard en su lugar.",
-      "key": "Clave pública",
-      "endpoint": "Endpoint público",
-      "port": "Puerto de escucha",
-      "peers": "Peers habilitados",
-      "total-peers": "Peers totales",
-      "endpoints": "Endpoints habilitados",
-      "total-endpoints": "Endpoints totales",
-      "ip": "Dirección IP",
-      "default-allowed-ip": "IPs permitidas por defecto",
-      "dns": "Servidores DNS",
-      "mtu": "MTU",
-      "default-keep-alive": "Intervalo Keepalive por defecto",
-      "button-show-config": "Mostrar configuración",
-      "button-download-config": "Descargar configuración",
-      "button-store-config": "Guardar configuración para wg-quick",
-      "button-edit": "Editar interfaz"
-    },
-    "button-add-interface": "Agregar interfaz",
-    "button-add-peer": "Agregar peer",
-    "button-add-peers": "Agregar múltiples peers",
-    "button-show-peer": "Mostrar peer",
-    "button-edit-peer": "Editar peer",
-    "peer-disabled": "Peer deshabilitado, motivo:",
-    "peer-expiring": "El peer expira en",
-    "peer-connected": "Conectado",
-    "peer-not-connected": "No conectado",
-    "peer-handshake": "Último handshake:"
-  },
-  "users": {
-    "headline": "Administración de usuarios",
-    "table-heading": {
-      "id": "ID",
-      "email": "Correo electrónico",
-      "firstname": "Nombre",
-      "lastname": "Apellido",
-      "source": "Origen",
-      "peers": "Peers",
-      "admin": "Administrador"
-    },
-    "no-user": {
-      "headline": "No hay usuarios disponibles",
-      "abstract": "Actualmente no hay usuarios registrados en el Portal WireGuard."
-    },
-    "button-add-user": "Agregar usuario",
-    "button-show-user": "Mostrar usuario",
-    "button-edit-user": "Editar usuario",
-    "user-disabled": "Usuario deshabilitado, motivo:",
-    "user-locked": "Cuenta bloqueada, motivo:",
-    "admin": "El usuario tiene privilegios de administrador",
-    "no-admin": "El usuario no tiene privilegios de administrador"
-  },
-  "profile": {
-    "headline": "Mis peers VPN",
-    "table-heading": {
-      "name": "Nombre",
-      "ip": "IP's",
-      "stats": "Estado",
-      "interface": "Interfaz del servidor"
-    },
-    "no-peer": {
-      "headline": "No hay peers disponibles",
-      "abstract": "Actualmente no hay peers asociados a tu perfil de usuario."
-    },
-    "peer-connected": "Conectado",
-    "button-add-peer": "Agregar peer",
-    "button-show-peer": "Mostrar peer",
-    "button-edit-peer": "Editar peer"
-  },
-  "settings": {
-    "headline": "Configuración",
-    "abstract": "Aquí puedes cambiar tu configuración personal.",
-    "api": {
-      "headline": "Configuración de API",
-      "abstract": "Aquí puedes configurar los ajustes de la API RESTful.",
-      "active-description": "La API está actualmente activa para tu cuenta. Todas las solicitudes están autenticadas con Basic Auth. Usa las siguientes credenciales.",
-      "inactive-description": "La API está actualmente inactiva. Presiona el botón de abajo para activarla.",
-      "user-label": "Usuario de la API:",
-      "user-placeholder": "Usuario de la API",
-      "token-label": "Contraseña de la API:",
-      "token-placeholder": "Token de la API",
-      "token-created-label": "Acceso API concedido en: ",
-      "button-disable-title": "Desactivar API, invalidará el token actual.",
-      "button-disable-text": "Desactivar API",
-      "button-enable-title": "Activar API, generará un nuevo token.",
-      "button-enable-text": "Activar API",
-      "api-link": "Documentación de API"
-    },
-    "webauthn": {
-      "headline": "Configuración de llave de acceso",
-      "abstract": "Las llaves de acceso son una forma moderna de autenticar usuarios sin necesidad de contraseñas. Se almacenan de forma segura en tu navegador y pueden usarse para iniciar sesión en el Portal WireGuard.",
-      "active-description": "Al menos una llave de acceso está activa en tu cuenta.",
-      "inactive-description": "Actualmente no hay llaves de acceso registradas. Presiona el botón de abajo para registrar una.",
-      "table": {
-        "name": "Nombre",
-        "created": "Creada",
-        "actions": ""
-      },
-      "credentials-list": "Llaves de acceso registradas actualmente",
-      "modal-delete": {
-        "headline": "Eliminar llaves de acceso",
-        "abstract": "¿Seguro que deseas eliminar esta llave de acceso? Ya no podrás usarla para iniciar sesión.",
-        "created": "Creada:",
-        "button-delete": "Eliminar",
-        "button-cancel": "Cancelar"
-      },
-      "button-rename-title": "Renombrar",
-      "button-rename-text": "Renombrar la llave de acceso.",
-      "button-save-title": "Guardar",
-      "button-save-text": "Guardar el nuevo nombre de la llave de acceso.",
-      "button-cancel-title": "Cancelar",
-      "button-cancel-text": "Cancelar el renombrado de la llave de acceso.",
-      "button-delete-title": "Eliminar",
-      "button-delete-text": "Eliminar la llave de acceso. Ya no podrás iniciar sesión con ella.",
-      "button-register-title": "Registrar llave de acceso",
-      "button-register-text": "Registrar una nueva llave de acceso para proteger tu cuenta."
-    }
-  },
-  "audit": {
-    "headline": "Registro de Auditoría",
-    "abstract": "Aquí puedes encontrar el registro de auditoría de todas las acciones realizadas en el Portal WireGuard.",
-    "no-entries": {
-      "headline": "No hay entradas en el registro",
-      "abstract": "Actualmente no se han registrado auditorías."
-    },
-    "entries-headline": "Entradas del Registro",
-    "table-heading": {
-      "id": "#",
-      "time": "Hora",
-      "user": "Usuario",
-      "severity": "Severidad",
-      "origin": "Origen",
-      "message": "Mensaje"
-    }
-  },
-  "keygen": {
-    "headline": "Generador de claves WireGuard",
-    "abstract": "Genera nuevas claves de WireGuard. Las claves se generan en tu navegador local y nunca se envían al servidor.",
-    "headline-keypair": "Nuevo par de claves",
-    "headline-preshared-key": "Nueva clave pre-compartida",
-    "button-generate": "Generar",
-    "private-key": {
-      "label": "Clave privada",
-      "placeholder": "La clave privada"
-    },
-    "public-key": {
-      "label": "Clave pública",
-      "placeholder": "La clave pública"
-    },
-    "preshared-key": {
-      "label": "Clave pre-compartida",
-      "placeholder": "La clave pre-compartida"
-    }
-  },
-  "modals": {
-    "user-view": {
-      "headline": "Cuenta de Usuario:",
-      "tab-user": "Información",
-      "tab-peers": "Peers",
-      "headline-info": "Información del Usuario:",
-      "headline-notes": "Notas:",
-      "email": "Correo Electrónico",
-      "firstname": "Nombre",
-      "lastname": "Apellido",
-      "phone": "Número de Teléfono",
-      "depeertment": "Departamento",
-      "api-enabled": "Acceso API",
-      "disabled": "Cuenta Deshabilitada",
-      "locked": "Cuenta Bloqueada",
-      "no-peers": "El usuario no tiene peers asociados.",
-      "peers": {
-        "name": "Nombre",
-        "interface": "Interfaz",
-        "ip": "IP's"
-      }
-    },
-    "user-edit": {
-      "headline-edit": "Editar usuario:",
-      "headline-new": "Nuevo usuario",
-      "header-general": "General",
-      "header-personal": "Información del Usuario",
-      "header-notes": "Notas",
-      "header-state": "Estado",
-      "identifier": {
-        "label": "Identificador",
-        "placeholder": "El identificador único del usuario"
-      },
-      "source": {
-        "label": "Origen",
-        "placeholder": "El origen del usuario"
-      },
-      "password": {
-        "label": "Contraseña",
-        "placeholder": "Una contraseña súper segura",
-        "description": "Deja este campo en blanco para mantener la contraseña actual.",
-        "too-weak": "La contraseña es demasiado débil. Por favor usa una más fuerte."
-      },
-      "email": {
-        "label": "Correo",
-        "placeholder": "La dirección de correo"
-      },
-      "phone": {
-        "label": "Teléfono",
-        "placeholder": "El número de teléfono"
-      },
-      "depeertment": {
-        "label": "Departamento",
-        "placeholder": "El departamento"
-      },
-      "firstname": {
-        "label": "Nombre",
-        "placeholder": "Nombre"
-      },
-      "lastname": {
-        "label": "Apellido",
-        "placeholder": "Apellido"
-      },
-      "notes": {
-        "label": "Notas",
-        "placeholder": ""
-      },
-      "disabled": {
-        "label": "Deshabilitado (sin conexión WireGuard y sin posibilidad de inicio de sesión)"
-      },
-      "locked": {
-        "label": "Bloqueado (no es posible iniciar sesión, las conexiones WireGuard aún funcionan)"
-      },
-      "admin": {
-        "label": "Es administrador"
-      }
-    },
-    "interface-view": {
-      "headline": "Configuración de la interfaz:"
-    },
-    "interface-edit": {
-      "headline-edit": "Editar interfaz:",
-      "headline-new": "Nueva interfaz",
-      "tab-interface": "Interfaz",
-      "tab-peerdef": "Valores predeterminados del peer",
-      "header-general": "General",
-      "header-network": "Red",
-      "header-crypto": "Criptografía",
-      "header-hooks": "Hooks de interfaz",
-      "header-peer-hooks": "Hooks",
-      "header-state": "Estado",
-      "identifier": {
-        "label": "Identificador",
-        "placeholder": "El identificador único de la interfaz"
-      },
-      "mode": {
-        "label": "Modo de Interfaz",
-        "server": "Modo Servidor",
-        "client": "Modo Cliente",
-        "any": "Modo Desconocido"
-      },
-      "backend": {
-        "label": "Backend de la Interfaz",
-        "invalid-label": "El backend original ya no está disponible, usando el backend local de WireGuard en su lugar.",
-        "local": "Backend local de WireGuard"
-      },
-      "display-name": {
-        "label": "Nombre para Mostrar",
-        "placeholder": "El nombre descriptivo de la interfaz"
-      },
-      "private-key": {
-        "label": "La clave Privada",
-        "placeholder": "La clave privada"
-      },
-      "public-key": {
-        "label": "La clave pública",
-        "placeholder": "La clave pública"
-      },
-      "ip": {
-        "label": "Direcciones IP",
-        "placeholder": "Direcciones IP (formato CIDR)"
-      },
-      "listen-port": {
-        "label": "Puerto de Escucha",
-        "placeholder": "El puerto de escucha"
-      },
-      "dns": {
-        "label": "Servidor DNS",
-        "placeholder": "Los servidores DNS que deben usarse"
-      },
-      "dns-search": {
-        "label": "Dominios de Búsqueda DNS",
-        "placeholder": "Prefijos de búsqueda DNS"
-      },
-      "mtu": {
-        "label": "MTU",
-        "placeholder": "La MTU de la interfaz (0 = mantener por defecto)"
-      },
-      "firewall-mark": {
-        "label": "Marca de Firewall",
-        "placeholder": "Marca de firewall que se aplica al tráfico saliente. (0 = automático)"
-      },
-      "routing-table": {
-        "label": "Tabla de Enrutamiento",
-        "placeholder": "El ID de la tabla de enrutamiento",
-        "description": "Casos especiales: off = no administrar rutas, 0 = automático"
-      },
-      "pre-up": {
-        "label": "Pre-Up",
-        "placeholder": "Uno o varios comandos bash separados por ;"
-      },
-      "post-up": {
-        "label": "Post-Up",
-        "placeholder": "Uno o varios comandos bash separados por ;"
-      },
-      "pre-down": {
-        "label": "Pre-Down",
-        "placeholder": "Uno o varios comandos bash separados por ;"
-      },
-      "post-down": {
-        "label": "Post-Down",
-        "placeholder": "Uno o varios comandos bash separados por ;"
-      },
-      "disabled": {
-        "label": "Interfaz Deshabilitada"
-      },
-      "save-config": {
-        "label": "Guardar automáticamente la configuración de wg-quick"
-      },
-      "defaults": {
-        "endpoint": {
-          "label": "Dirección del Endpoint",
-          "placeholder": "Dirección del Endpoint",
-          "description": "La dirección del endpoint al que los peers se conectarán. (ej: wg.ejemplo.com o wg.ejemplo.com:51820)"
-        },
-        "networks": {
-          "label": "Redes IP",
-          "placeholder": "Direcciones de Red",
-          "description": "Los peers obtendrán direcciones IP de esas subredes."
-        },
-        "allowed-ip": {
-          "label": "Direcciones IP Permitidas",
-          "placeholder": "Direcciones IP Permitidas por Defecto"
-        },
-        "mtu": {
-          "label": "MTU",
-          "placeholder": "La MTU del cliente (0 = mantener por defecto)"
-        },
-        "keep-alive": {
-          "label": "Intervalo de Keep Alive",
-          "placeholder": "Keepalive Persistente (0 = por defecto)"
-        }
-      },
-      "button-apply-defaults": "Aplicar Valores Predeterminados de peers"
-    },
-    "peer-view": {
-      "headline-peer": "Peer:",
-      "headline-endpoint": "Endpoint:",
-      "section-info": "Información del peer",
-      "section-status": "Estado Actual",
-      "section-config": "Configuración",
-      "identifier": "Identificador",
-      "ip": "Direcciones IP",
-      "user": "Usuario Asociado",
-      "notes": "Notas",
-      "expiry-status": "Expira en",
-      "disabled-status": "Deshabilitado en",
-      "traffic": "Tráfico",
-      "connection-status": "Estadísticas de Conexión",
-      "upload": "Bytes Subidos (del Servidor al peer)",
-      "download": "Bytes Descargados (del peer al Servidor)",
-      "pingable": "Es Alcanzable (Ping)",
-      "handshake": "Último Handshake",
-      "connected-since": "Conectado desde",
-      "endpoint": "Endpoint",
-      "button-download": "Descargar configuración",
-      "button-email": "Enviar configuración por Correo Electrónico",
-      "style-label": "Estilo de Configuración"
-    },
-    "peer-edit": {
-      "headline-edit-peer": "Editar peer:",
-      "headline-edit-endpoint": "Editar endpoint:",
-      "headline-new-peer": "Crear peer",
-      "headline-new-endpoint": "Crear endpoint",
-      "header-general": "General",
-      "header-network": "Red",
-      "header-crypto": "Criptografía",
-      "header-hooks": "Hooks (Ejecutados en el peer)",
-      "header-state": "Estado",
-      "display-name": {
-        "label": "Nombre para Mostrar",
-        "placeholder": "El nombre descriptivo para el peer"
-      },
-      "linked-user": {
-        "label": "Usuario Vinculado",
-        "placeholder": "La cuenta de usuario que posee este peer"
-      },
-      "private-key": {
-        "label": "Clave Privada",
-        "placeholder": "Clave privada",
-        "help": "La clave privada se almacena de forma segura en el servidor. Si el usuario ya posee una copia, puedes omitir este campo. El servidor sigue funcionando exclusivamente con la clave pública del peer."
-      },
-      "public-key": {
-        "label": "Cave Pública",
-        "placeholder": "La Clave pública"
-      },
-      "preshared-key": {
-        "label": "Clave pre-compartida",
-        "placeholder": "Clave pre-compartida opcional"
-      },
-      "endpoint": {
-        "label": "Dirección del endpoint",
-        "placeholder": "La dirección del endpoint remoto"
-      },
-      "ip": {
-        "label": "Direcciones IP",
-        "placeholder": "Direcciones IP (formato CIDR)"
-      },
-      "allowed-ip": {
-        "label": "Direcciones IP permitidas",
-        "placeholder": "Direcciones IP permitidas (formato CIDR)"
-      },
-      "extra-allowed-ip": {
-        "label": "Direcciones IP permitidas extra",
-        "placeholder": "IPs extra permitidas (lado del servidor)",
-        "description": "Esas IPs serán agregadas en la interfaz remota de WireGuard como direcciones IP permitidas."
-      },
-      "dns": {
-        "label": "Servidor DNS",
-        "placeholder": "Los servidores DNS que deben usarse"
-      },
-      "dns-search": {
-        "label": "Dominios de búsqueda DNS",
-        "placeholder": "Prefijos de búsqueda DNS"
-      },
-      "keep-alive": {
-        "label": "Intervalo de Keep Alive",
-        "placeholder": "Keepalive Persistente (0 = por defecto)"
-      },
-      "mtu": {
-        "label": "MTU",
-        "placeholder": "La MTU del cliente (0 = mantener por defecto)"
-      },
-      "pre-up": {
-        "label": "Pre-Up",
-        "placeholder": "Uno o varios comandos bash separados por ;"
-      },
-      "post-up": {
-        "label": "Post-Up",
-        "placeholder": "Uno o varios comandos bash separados por ;"
-      },
-      "pre-down": {
-        "label": "Pre-Down",
-        "placeholder": "Uno o varios comandos bash separados por ;"
-      },
-      "post-down": {
-        "label": "Post-Down",
-        "placeholder": "Uno o varios comandos bash separados por ;"
-      },
-      "disabled": {
-        "label": "Peer Deshabilitado"
-      },
-      "ignore-global": {
-        "label": "Ignorar configuración global"
-      },
-      "expires-at": {
-        "label": "Fecha de expiración"
-      }
-    },
-    "peer-multi-create": {
-      "headline-peer": "Crear múltiples peers",
-      "headline-endpoint": "Crear múltiples endpoints",
-      "identifiers": {
-        "label": "Identificadores de Usuario",
-        "placeholder": "Identificadores de Usuario",
-        "description": "Un identificador de usuario (el nombre de usuario) para el cual debe crearse un peer."
-      },
-      "prefix": {
-        "headline-peer": "peer:",
-        "headline-endpoint": "Endpoint:",
-        "label": "Prefijo del Nombre peera Mostrar",
-        "placeholder": "El prefijo",
-        "description": "Un prefijo que se agregará al nombre mostrado de los peers."
-      }
-    }
-  }
-}
--- a/frontend/src/views/InterfaceView.vue
+++ b/frontend/src/views/InterfaceView.vue
@@ -218,12 +218,12 @@ onMounted(async () => {
                  <td><span class="badge bg-light me-1" v-for="addr in interfaces.GetSelected.Addresses" :key="addr">{{addr}}</span></td>
                </tr>
                <tr>
-                  <td>{{ $t('interfaces.interface.mtu') }}:</td>
-                  <td>{{interfaces.GetSelected.Mtu}}</td>
+                  <td>{{ $t('interfaces.interface.dns') }}:</td>
+                  <td><span class="badge bg-light me-1" v-for="addr in interfaces.GetSelected.Dns" :key="addr">{{addr}}</span></td>
                </tr>
                <tr>
-                  <td>{{ $t('interfaces.interface.default-dns') }}:</td>
-                  <td><span class="badge bg-light me-1" v-for="addr in interfaces.GetSelected.PeerDefDns" :key="addr">{{addr}}</span></td>
+                  <td>{{ $t('interfaces.interface.mtu') }}:</td>
+                  <td>{{interfaces.GetSelected.Mtu}}</td>
                </tr>
                <tr>
                  <td>{{ $t('interfaces.interface.default-keep-alive') }}:</td>
--- a/go.mod
+++ b/go.mod
@@ -5,11 +5,11 @@ go 1.24.0
 require (
 	github.com/a8m/envsubst v1.4.3
 	github.com/alexedwards/scs/v2 v2.9.0
-	github.com/coreos/go-oidc/v3 v3.16.0
+	github.com/coreos/go-oidc/v3 v3.15.0
 	github.com/glebarez/sqlite v1.11.0
-	github.com/go-ldap/ldap/v3 v3.4.12
+	github.com/go-ldap/ldap/v3 v3.4.11
 	github.com/go-pkgz/routegroup v1.5.3
-	github.com/go-playground/validator/v10 v10.28.0
+	github.com/go-playground/validator/v10 v10.27.0
 	github.com/go-webauthn/webauthn v0.14.0
 	github.com/google/uuid v1.6.0
 	github.com/prometheus-community/pro-bing v0.7.0
@@ -44,17 +44,22 @@ require (
 	github.com/gabriel-vasile/mimetype v1.4.10 // indirect
 	github.com/glebarez/go-sqlite v1.22.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
-	github.com/go-jose/go-jose/v4 v4.1.3 // indirect
-	github.com/go-openapi/jsonpointer v0.22.1 // indirect
-	github.com/go-openapi/jsonreference v0.21.2 // indirect
-	github.com/go-openapi/spec v0.22.0 // indirect
-	github.com/go-openapi/swag/conv v0.25.1 // indirect
-	github.com/go-openapi/swag/jsonname v0.25.1 // indirect
-	github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
-	github.com/go-openapi/swag/loading v0.25.1 // indirect
-	github.com/go-openapi/swag/stringutils v0.25.1 // indirect
-	github.com/go-openapi/swag/typeutils v0.25.1 // indirect
-	github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.2 // indirect
+	github.com/go-openapi/jsonpointer v0.22.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.1 // indirect
+	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/swag v0.24.1 // indirect
+	github.com/go-openapi/swag/cmdutils v0.24.0 // indirect
+	github.com/go-openapi/swag/conv v0.24.0 // indirect
+	github.com/go-openapi/swag/fileutils v0.24.0 // indirect
+	github.com/go-openapi/swag/jsonname v0.24.0 // indirect
+	github.com/go-openapi/swag/jsonutils v0.24.0 // indirect
+	github.com/go-openapi/swag/loading v0.24.0 // indirect
+	github.com/go-openapi/swag/mangling v0.24.0 // indirect
+	github.com/go-openapi/swag/netutils v0.24.0 // indirect
+	github.com/go-openapi/swag/stringutils v0.24.0 // indirect
+	github.com/go-openapi/swag/typeutils v0.24.0 // indirect
+	github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-sql-driver/mysql v1.9.3 // indirect
@@ -64,14 +69,16 @@ require (
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/go-tpm v0.9.6 // indirect
+	github.com/google/go-tpm v0.9.5 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/pgx/v5 v5.7.6 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mdlayher/genetlink v1.3.2 // indirect
 	github.com/mdlayher/netlink v1.8.0 // indirect
@@ -89,19 +96,18 @@ require (
 	github.com/vishvananda/netns v0.0.5 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/yeqown/reedsolomon v1.0.0 // indirect
-	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
 	golang.org/x/mod v0.28.0 // indirect
-	golang.org/x/net v0.44.0 // indirect
+	golang.org/x/net v0.43.0 // indirect
 	golang.org/x/sync v0.17.0 // indirect
 	golang.org/x/text v0.29.0 // indirect
-	golang.org/x/tools v0.37.0 // indirect
+	golang.org/x/tools v0.36.0 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
-	modernc.org/libc v1.66.10 // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
+	modernc.org/libc v1.66.8 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.39.0 // indirect
+	modernc.org/sqlite v1.38.2 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -30,16 +30,16 @@ github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/a8m/envsubst v1.4.3 h1:kDF7paGK8QACWYaQo6KtyYBozY2jhQrTuNNuUxQkhJY=
 github.com/a8m/envsubst v1.4.3/go.mod h1:4jjHWQlZoaXPoLQUb7H2qT4iLkZDdmEQiOUogdUmqVU=
-github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e h1:4dAU9FXIyQktpoUAgOJK3OTFc/xug0PCXYCqU0FgDKI=
-github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
+github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
+github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
 github.com/alexedwards/scs/v2 v2.9.0 h1:xa05mVpwTBm1iLeTMNFfAWpKUm4fXAW7CeAViqBVS90=
 github.com/alexedwards/scs/v2 v2.9.0/go.mod h1:ToaROZxyKukJKT/xLcVQAChi5k6+Pn1Gvmdl7h3RRj8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/coreos/go-oidc/v3 v3.16.0 h1:qRQUCFstKpXwmEjDQTIbyY/5jF00+asXzSkmkoa/mow=
-github.com/coreos/go-oidc/v3 v3.16.0/go.mod h1:wqPbKFrVnE90vty060SB40FCJ8fTHTxSwyXJqZH+sI8=
+github.com/coreos/go-oidc/v3 v3.15.0 h1:R6Oz8Z4bqWR7VFQ+sPSvZPQv4x8M+sJkDO5ojgwlyAg=
+github.com/coreos/go-oidc/v3 v3.15.0/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -58,33 +58,40 @@ github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GM
 github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ=
 github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ4S3TGls2FvczZtj5Re/2ZzkV9VwqPHH/3Bo=
 github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
-github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
-github.com/go-ldap/ldap/v3 v3.4.12 h1:1b81mv7MagXZ7+1r7cLTWmyuTqVqdwbtJSjC0DAp9s4=
-github.com/go-ldap/ldap/v3 v3.4.12/go.mod h1:+SPAGcTtOfmGsCb3h1RFiq4xpp4N636G75OEace8lNo=
-github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk=
-github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM=
-github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5M/lFU6tSWU=
-github.com/go-openapi/jsonreference v0.21.2/go.mod h1:pp3PEjIsJ9CZDGCNOyXIQxsNuroxm8FAJ/+quA0yKzQ=
-github.com/go-openapi/spec v0.22.0 h1:xT/EsX4frL3U09QviRIZXvkh80yibxQmtoEvyqug0Tw=
-github.com/go-openapi/spec v0.22.0/go.mod h1:K0FhKxkez8YNS94XzF8YKEMULbFrRw4m15i2YUht4L0=
-github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
-github.com/go-openapi/swag/conv v0.25.1 h1:+9o8YUg6QuqqBM5X6rYL/p1dpWeZRhoIt9x7CCP+he0=
-github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs=
-github.com/go-openapi/swag/jsonname v0.25.1 h1:Sgx+qbwa4ej6AomWC6pEfXrA6uP2RkaNjA9BR8a1RJU=
-github.com/go-openapi/swag/jsonname v0.25.1/go.mod h1:71Tekow6UOLBD3wS7XhdT98g5J5GR13NOTQ9/6Q11Zo=
-github.com/go-openapi/swag/jsonutils v0.25.1 h1:AihLHaD0brrkJoMqEZOBNzTLnk81Kg9cWr+SPtxtgl8=
-github.com/go-openapi/swag/jsonutils v0.25.1/go.mod h1:JpEkAjxQXpiaHmRO04N1zE4qbUEg3b7Udll7AMGTNOo=
-github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1 h1:DSQGcdB6G0N9c/KhtpYc71PzzGEIc/fZ1no35x4/XBY=
-github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1/go.mod h1:kjmweouyPwRUEYMSrbAidoLMGeJ5p6zdHi9BgZiqmsg=
-github.com/go-openapi/swag/loading v0.25.1 h1:6OruqzjWoJyanZOim58iG2vj934TysYVptyaoXS24kw=
-github.com/go-openapi/swag/loading v0.25.1/go.mod h1:xoIe2EG32NOYYbqxvXgPzne989bWvSNoWoyQVWEZicc=
-github.com/go-openapi/swag/stringutils v0.25.1 h1:Xasqgjvk30eUe8VKdmyzKtjkVjeiXx1Iz0zDfMNpPbw=
-github.com/go-openapi/swag/stringutils v0.25.1/go.mod h1:JLdSAq5169HaiDUbTvArA2yQxmgn4D6h4A+4HqVvAYg=
-github.com/go-openapi/swag/typeutils v0.25.1 h1:rD/9HsEQieewNt6/k+JBwkxuAHktFtH3I3ysiFZqukA=
-github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8=
-github.com/go-openapi/swag/yamlutils v0.25.1 h1:mry5ez8joJwzvMbaTGLhw8pXUnhDK91oSJLDPF1bmGk=
-github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg=
+github.com/go-jose/go-jose/v4 v4.1.2 h1:TK/7NqRQZfgAh+Td8AlsrvtPoUyiHh0LqVvokh+1vHI=
+github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo=
+github.com/go-ldap/ldap/v3 v3.4.11 h1:4k0Yxweg+a3OyBLjdYn5OKglv18JNvfDykSoI8bW0gU=
+github.com/go-ldap/ldap/v3 v3.4.11/go.mod h1:bY7t0FLK8OAVpp/vV6sSlpz3EQDGcQwc8pF0ujLgKvM=
+github.com/go-openapi/jsonpointer v0.22.0 h1:TmMhghgNef9YXxTu1tOopo+0BGEytxA+okbry0HjZsM=
+github.com/go-openapi/jsonpointer v0.22.0/go.mod h1:xt3jV88UtExdIkkL7NloURjRQjbeUgcxFblMjq2iaiU=
+github.com/go-openapi/jsonreference v0.21.1 h1:bSKrcl8819zKiOgxkbVNRUBIr6Wwj9KYrDbMjRs0cDA=
+github.com/go-openapi/jsonreference v0.21.1/go.mod h1:PWs8rO4xxTUqKGu+lEvvCxD5k2X7QYkKAepJyCmSTT8=
+github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
+github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
+github.com/go-openapi/swag v0.24.1 h1:DPdYTZKo6AQCRqzwr/kGkxJzHhpKxZ9i/oX0zag+MF8=
+github.com/go-openapi/swag v0.24.1/go.mod h1:sm8I3lCPlspsBBwUm1t5oZeWZS0s7m/A+Psg0ooRU0A=
+github.com/go-openapi/swag/cmdutils v0.24.0 h1:KlRCffHwXFI6E5MV9n8o8zBRElpY4uK4yWyAMWETo9I=
+github.com/go-openapi/swag/cmdutils v0.24.0/go.mod h1:uxib2FAeQMByyHomTlsP8h1TtPd54Msu2ZDU/H5Vuf8=
+github.com/go-openapi/swag/conv v0.24.0 h1:ejB9+7yogkWly6pnruRX45D1/6J+ZxRu92YFivx54ik=
+github.com/go-openapi/swag/conv v0.24.0/go.mod h1:jbn140mZd7EW2g8a8Y5bwm8/Wy1slLySQQ0ND6DPc2c=
+github.com/go-openapi/swag/fileutils v0.24.0 h1:U9pCpqp4RUytnD689Ek/N1d2N/a//XCeqoH508H5oak=
+github.com/go-openapi/swag/fileutils v0.24.0/go.mod h1:3SCrCSBHyP1/N+3oErQ1gP+OX1GV2QYFSnrTbzwli90=
+github.com/go-openapi/swag/jsonname v0.24.0 h1:2wKS9bgRV/xB8c62Qg16w4AUiIrqqiniJFtZGi3dg5k=
+github.com/go-openapi/swag/jsonname v0.24.0/go.mod h1:GXqrPzGJe611P7LG4QB9JKPtUZ7flE4DOVechNaDd7Q=
+github.com/go-openapi/swag/jsonutils v0.24.0 h1:F1vE1q4pg1xtO3HTyJYRmEuJ4jmIp2iZ30bzW5XgZts=
+github.com/go-openapi/swag/jsonutils v0.24.0/go.mod h1:vBowZtF5Z4DDApIoxcIVfR8v0l9oq5PpYRUuteVu6f0=
+github.com/go-openapi/swag/loading v0.24.0 h1:ln/fWTwJp2Zkj5DdaX4JPiddFC5CHQpvaBKycOlceYc=
+github.com/go-openapi/swag/loading v0.24.0/go.mod h1:gShCN4woKZYIxPxbfbyHgjXAhO61m88tmjy0lp/LkJk=
+github.com/go-openapi/swag/mangling v0.24.0 h1:PGOQpViCOUroIeak/Uj/sjGAq9LADS3mOyjznmHy2pk=
+github.com/go-openapi/swag/mangling v0.24.0/go.mod h1:Jm5Go9LHkycsz0wfoaBDkdc4CkpuSnIEf62brzyCbhc=
+github.com/go-openapi/swag/netutils v0.24.0 h1:Bz02HRjYv8046Ycg/w80q3g9QCWeIqTvlyOjQPDjD8w=
+github.com/go-openapi/swag/netutils v0.24.0/go.mod h1:WRgiHcYTnx+IqfMCtu0hy9oOaPR0HnPbmArSRN1SkZM=
+github.com/go-openapi/swag/stringutils v0.24.0 h1:i4Z/Jawf9EvXOLUbT97O0HbPUja18VdBxeadyAqS1FM=
+github.com/go-openapi/swag/stringutils v0.24.0/go.mod h1:5nUXB4xA0kw2df5PRipZDslPJgJut+NjL7D25zPZ/4w=
+github.com/go-openapi/swag/typeutils v0.24.0 h1:d3szEGzGDf4L2y1gYOSSLeK6h46F+zibnEas2Jm/wIw=
+github.com/go-openapi/swag/typeutils v0.24.0/go.mod h1:q8C3Kmk/vh2VhpCLaoR2MVWOGP8y7Jc8l82qCTd1DYI=
+github.com/go-openapi/swag/yamlutils v0.24.0 h1:bhw4894A7Iw6ne+639hsBNRHg9iZg/ISrOVr+sJGp4c=
+github.com/go-openapi/swag/yamlutils v0.24.0/go.mod h1:DpKv5aYuaGm/sULePoeiG8uwMpZSfReo1HR3Ik0yaG8=
 github.com/go-pkgz/routegroup v1.5.3 h1:IvH1KLcQkMap9jucQGBlef3IBloxSAe8USUFvxShFqs=
 github.com/go-pkgz/routegroup v1.5.3/go.mod h1:Pmu04fhgWhRtBMIJ8HXppnnzOPjnL/IEPBIdO2zmeqg=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
@@ -93,8 +100,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688=
-github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
+github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4=
+github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
 github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
 github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
@@ -115,8 +122,8 @@ github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EO
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/go-tpm v0.9.6 h1:Ku42PT4LmjDu1H5C5ISWLlpI1mj+Zq7sPGKoRw2XROA=
-github.com/google/go-tpm v0.9.6/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
+github.com/google/go-tpm v0.9.5 h1:ocUmnDebX54dnW+MQWGQRbdaAcJELsa6PqZhJ48KwVU=
+github.com/google/go-tpm v0.9.5/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
 github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
 github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -151,6 +158,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -164,6 +173,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
+github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mdlayher/genetlink v1.3.2 h1:KdrNKe+CTu+IbZnm/GVUMXSqBBLqcGpRDa0xkQy56gw=
@@ -246,10 +257,10 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
 go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
-go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
-go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
-go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
-go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
+go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
+go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
@@ -264,8 +275,8 @@ golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v
 golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
 golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
-golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 h1:TQwNpfvNkxAVlItJf6Cr5JTsVZoC/Sj7K3OZv2Pc14A=
-golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=
+golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b h1:DXr+pvt3nC887026GRP39Ej11UATqWDmWuS99x26cD0=
+golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -291,8 +302,8 @@ golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
-golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
-golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/oauth2 v0.31.0 h1:8Fq0yVZLh4j4YA47vHKFTa9Ew5XIrCP8LC6UeNZnLxo=
 golang.org/x/oauth2 v0.31.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -362,15 +373,15 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
-golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
+golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
+golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb h1:whnFRlWMcXI9d+ZbWg+4sHnLp52d5yiIPUxMBSt4X9A=
 golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb/go.mod h1:rpwXGsirqLqN2L0JDJQlwOboGHmptD5ZD6T2VmcqhTw=
 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 h1:3GDAcqdIg1ozBNLgPy4SLT84nfcBjr6rhGtXYtrkWLU=
 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10/go.mod h1:T97yPqesLiNrOYxkwmhMI0ZIlJDm+p0PMR8eRVeR5tQ=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
+google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -390,18 +401,18 @@ gorm.io/driver/sqlserver v1.6.1/go.mod h1:VZeNn7hqX1aXoN5TPAFGWvxWG90xtA8erGn2gQ
 gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE=
 gorm.io/gorm v1.31.0 h1:0VlycGreVhK7RF/Bwt51Fk8v0xLiiiFdbGDPIZQ7mJY=
 gorm.io/gorm v1.31.0/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
-modernc.org/cc/v4 v4.26.5 h1:xM3bX7Mve6G8K8b+T11ReenJOT+BmVqQj0FY5T4+5Y4=
-modernc.org/cc/v4 v4.26.5/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
+modernc.org/cc/v4 v4.26.4 h1:jPhG8oNjtTYuP2FA4YefTJ/wioNUGALmGuEWt7SUR6s=
+modernc.org/cc/v4 v4.26.4/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
 modernc.org/ccgo/v4 v4.28.1 h1:wPKYn5EC/mYTqBO373jKjvX2n+3+aK7+sICCv4Fjy1A=
 modernc.org/ccgo/v4 v4.28.1/go.mod h1:uD+4RnfrVgE6ec9NGguUNdhqzNIeeomeXf6CL0GTE5Q=
-modernc.org/fileutil v1.3.40 h1:ZGMswMNc9JOCrcrakF1HrvmergNLAmxOPjizirpfqBA=
-modernc.org/fileutil v1.3.40/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
+modernc.org/fileutil v1.3.28 h1:Vp156KUA2nPu9F1NEv036x9UGOjg2qsi5QlWTjZmtMk=
+modernc.org/fileutil v1.3.28/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
 modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
 modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
 modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
 modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
-modernc.org/libc v1.66.10 h1:yZkb3YeLx4oynyR+iUsXsybsX4Ubx7MQlSYEw4yj59A=
-modernc.org/libc v1.66.10/go.mod h1:8vGSEwvoUoltr4dlywvHqjtAqHBaw0j1jI7iFBTAr2I=
+modernc.org/libc v1.66.8 h1:/awsvTnyN/sNjvJm6S3lb7KZw5WV4ly/sBEG7ZUzmIE=
+modernc.org/libc v1.66.8/go.mod h1:aVdcY7udcawRqauu0HukYYxtBSizV+R80n/6aQe9D5k=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
@@ -410,8 +421,8 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
 modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
 modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.39.0 h1:6bwu9Ooim0yVYA7IZn9demiQk/Ejp0BtTjBWFLymSeY=
-modernc.org/sqlite v1.39.0/go.mod h1:cPTJYSlgg3Sfg046yBShXENNtPrWrDX8bsbAQBzgQ5E=
+modernc.org/sqlite v1.38.2 h1:Aclu7+tgjgcQVShZqim41Bbw9Cho0y/7WzYptXqkEek=
+modernc.org/sqlite v1.38.2/go.mod h1:cPTJYSlgg3Sfg046yBShXENNtPrWrDX8bsbAQBzgQ5E=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
--- a/internal/adapters/wgcontroller/local.go
+++ b/internal/adapters/wgcontroller/local.go
@@ -14,6 +14,7 @@ import (

 	probing "github.com/prometheus-community/pro-bing"
 	"github.com/vishvananda/netlink"
+	"golang.org/x/sys/unix"
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"

@@ -83,8 +84,8 @@ func NewLocalController(cfg *config.Config) (*LocalController, error) {
 		wg: wg,
 		nl: nl,

-		shellCmd:              "bash",                            // we only support bash at the moment
-		resolvConfIfacePrefix: cfg.Backend.LocalResolvconfPrefix, // WireGuard interfaces have a tun. prefix in resolvconf
+		shellCmd:              "bash", // we only support bash at the moment
+		resolvConfIfacePrefix: "tun.", // WireGuard interfaces have a tun. prefix in resolvconf
 	}

 	return repo, nil
@@ -545,11 +546,7 @@ func (c LocalController) deletePeer(deviceId domain.InterfaceIdentifier, id doma

 // region wg-quick-related

-func (c LocalController) ExecuteInterfaceHook(
-	_ context.Context,
-	id domain.InterfaceIdentifier,
-	hookCmd string,
-) error {
+func (c LocalController) ExecuteInterfaceHook(id domain.InterfaceIdentifier, hookCmd string) error {
 	if hookCmd == "" {
 		return nil
 	}
@@ -563,7 +560,7 @@ func (c LocalController) ExecuteInterfaceHook(
 	return nil
 }

-func (c LocalController) SetDNS(_ context.Context, id domain.InterfaceIdentifier, dnsStr, dnsSearchStr string) error {
+func (c LocalController) SetDNS(id domain.InterfaceIdentifier, dnsStr, dnsSearchStr string) error {
 	if dnsStr == "" && dnsSearchStr == "" {
 		return nil
 	}
@@ -592,7 +589,7 @@ func (c LocalController) SetDNS(_ context.Context, id domain.InterfaceIdentifier
 	return nil
 }

-func (c LocalController) UnsetDNS(_ context.Context, id domain.InterfaceIdentifier, _, _ string) error {
+func (c LocalController) UnsetDNS(id domain.InterfaceIdentifier) error {
 	dnsCommand := "resolvconf -d %resPref%i -f"

 	err := c.exec(dnsCommand, id)
@@ -614,7 +611,7 @@ func (c LocalController) exec(command string, interfaceId domain.InterfaceIdenti
 	if len(stdin) > 0 {
 		b := &bytes.Buffer{}
 		for _, ln := range stdin {
-			if _, err := fmt.Fprint(b, ln+"\n"); err != nil {
+			if _, err := fmt.Fprint(b, ln); err != nil {
 				return err
 			}
 		}
@@ -622,8 +619,6 @@ func (c LocalController) exec(command string, interfaceId domain.InterfaceIdenti
 	}
 	out, err := cmd.CombinedOutput() // execute and wait for output
 	if err != nil {
-		slog.Warn("failed to executed shell command",
-			"command", commandWithInterfaceName, "stdin", stdin, "output", string(out), "error", err)
 		return fmt.Errorf("failed to exexute shell command %s: %w", commandWithInterfaceName, err)
 	}
 	slog.Debug("executed shell command",
@@ -636,28 +631,205 @@ func (c LocalController) exec(command string, interfaceId domain.InterfaceIdenti

 // region routing-related

-// SetRoutes sets the routes for the given interface. If no routes are provided, the function is a no-op.
-func (c LocalController) SetRoutes(
-	ctx context.Context,
-	interfaceId domain.InterfaceIdentifier,
-	table int,
-	fwMark uint32,
-	cidrs []domain.Cidr,
-) error {
+func (c LocalController) SyncRouteRules(_ context.Context, rules []domain.RouteRule) error {
+	// update fwmark rules
+	if err := c.setFwMarkRules(rules); err != nil {
+		return err
+	}
+
+	// update main rule
+	if err := c.setMainRule(rules); err != nil {
+		return err
+	}
+
+	// cleanup old main rules
+	if err := c.cleanupMainRule(rules); err != nil {
+		return err
+	}
+
 	return nil
 }

-// RemoveRoutes removes the routes for the given interface. If no routes are provided, the function is a no-op.
-func (c LocalController) RemoveRoutes(
-	ctx context.Context,
-	interfaceId domain.InterfaceIdentifier,
-	table int,
-	fwMark uint32,
-	oldCidrs []domain.Cidr,
-) error {
+func (c LocalController) setFwMarkRules(rules []domain.RouteRule) error {
+	for _, rule := range rules {
+		existingRules, err := c.nl.RuleList(int(rule.IpFamily))
+		if err != nil {
+			return fmt.Errorf("failed to get existing rules for family %s: %w", rule.IpFamily, err)
+		}
+
+		ruleExists := false
+		for _, existingRule := range existingRules {
+			if rule.FwMark == existingRule.Mark && rule.Table == existingRule.Table {
+				ruleExists = true
+				break
+			}
+		}
+
+		if ruleExists {
+			continue // rule already exists, no need to recreate it
+		}
+
+		// create a missing rule
+		if err := c.nl.RuleAdd(&netlink.Rule{
+			Family:            int(rule.IpFamily),
+			Table:             rule.Table,
+			Mark:              rule.FwMark,
+			Invert:            true,
+			SuppressIfgroup:   -1,
+			SuppressPrefixlen: -1,
+			Priority:          c.getRulePriority(existingRules),
+			Mask:              nil,
+			Goto:              -1,
+			Flow:              -1,
+		}); err != nil {
+			return fmt.Errorf("failed to setup %s rule for fwmark %d and table %d: %w",
+				rule.IpFamily, rule.FwMark, rule.Table, err)
+		}
+	}
 	return nil
 }

+func (c LocalController) getRulePriority(existingRules []netlink.Rule) int {
+	prio := 32700 // linux main rule has a priority of 32766
+	for {
+		isFresh := true
+		for _, existingRule := range existingRules {
+			if existingRule.Priority == prio {
+				isFresh = false
+				break
+			}
+		}
+		if isFresh {
+			break
+		} else {
+			prio--
+		}
+	}
+	return prio
+}
+
+func (c LocalController) setMainRule(rules []domain.RouteRule) error {
+	var family domain.IpFamily
+	shouldHaveMainRule := false
+	for _, rule := range rules {
+		family = rule.IpFamily
+		if rule.HasDefault == true {
+			shouldHaveMainRule = true
+			break
+		}
+	}
+	if !shouldHaveMainRule {
+		return nil
+	}
+
+	existingRules, err := c.nl.RuleList(int(family))
+	if err != nil {
+		return fmt.Errorf("failed to get existing rules for family %s: %w", family, err)
+	}
+
+	ruleExists := false
+	for _, existingRule := range existingRules {
+		if existingRule.Table == unix.RT_TABLE_MAIN && existingRule.SuppressPrefixlen == 0 {
+			ruleExists = true
+			break
+		}
+	}
+
+	if ruleExists {
+		return nil // rule already exists, skip re-creation
+	}
+
+	if err := c.nl.RuleAdd(&netlink.Rule{
+		Family:            int(family),
+		Table:             unix.RT_TABLE_MAIN,
+		SuppressIfgroup:   -1,
+		SuppressPrefixlen: 0,
+		Priority:          c.getMainRulePriority(existingRules),
+		Mark:              0,
+		Mask:              nil,
+		Goto:              -1,
+		Flow:              -1,
+	}); err != nil {
+		return fmt.Errorf("failed to setup rule for main table: %w", err)
+	}
+
+	return nil
+}
+
+func (c LocalController) getMainRulePriority(existingRules []netlink.Rule) int {
+	priority := c.cfg.Advanced.RulePrioOffset
+	for {
+		isFresh := true
+		for _, existingRule := range existingRules {
+			if existingRule.Priority == priority {
+				isFresh = false
+				break
+			}
+		}
+		if isFresh {
+			break
+		} else {
+			priority++
+		}
+	}
+	return priority
+}
+
+func (c LocalController) cleanupMainRule(rules []domain.RouteRule) error {
+	var family domain.IpFamily
+	for _, rule := range rules {
+		family = rule.IpFamily
+		break
+	}
+
+	existingRules, err := c.nl.RuleList(int(family))
+	if err != nil {
+		return fmt.Errorf("failed to get existing rules for family %s: %w", family, err)
+	}
+
+	shouldHaveMainRule := false
+	for _, rule := range rules {
+		if rule.HasDefault == true {
+			shouldHaveMainRule = true
+			break
+		}
+	}
+
+	mainRules := 0
+	for _, existingRule := range existingRules {
+		if existingRule.Table == unix.RT_TABLE_MAIN && existingRule.SuppressPrefixlen == 0 {
+			mainRules++
+		}
+	}
+
+	removalCount := 0
+	if mainRules > 1 {
+		removalCount = mainRules - 1 // we only want one single rule
+	}
+	if !shouldHaveMainRule {
+		removalCount = mainRules
+	}
+
+	for _, existingRule := range existingRules {
+		if existingRule.Table == unix.RT_TABLE_MAIN && existingRule.SuppressPrefixlen == 0 {
+			if removalCount > 0 {
+				existingRule.Family = int(family) // set family, somehow the RuleList method does not populate the family field
+				if err := c.nl.RuleDel(&existingRule); err != nil {
+					return fmt.Errorf("failed to delete main rule: %w", err)
+				}
+				removalCount--
+			}
+		}
+	}
+
+	return nil
+}
+
+func (c LocalController) DeleteRouteRules(_ context.Context, rules []domain.RouteRule) error {
+	// TODO implement me
+	panic("implement me")
+}
+
 // endregion routing-related

 // region statistics-related
--- a/internal/adapters/wgcontroller/mikrotik.go
+++ b/internal/adapters/wgcontroller/mikrotik.go
@@ -22,9 +22,8 @@ type MikrotikController struct {
 	client *lowlevel.MikrotikApiClient

 	// Add mutexes to prevent race conditions
-	interfaceMutexes sync.Map   // map[domain.InterfaceIdentifier]*sync.Mutex
-	peerMutexes      sync.Map   // map[domain.PeerIdentifier]*sync.Mutex
-	coreMutex        sync.Mutex // for updating the core configuration such as routing table or DNS settings
+	interfaceMutexes sync.Map // map[domain.InterfaceIdentifier]*sync.Mutex
+	peerMutexes      sync.Map // map[domain.PeerIdentifier]*sync.Mutex
 }

 func NewMikrotikController(coreCfg *config.Config, cfg *config.BackendMikrotik) (*MikrotikController, error) {
@@ -41,7 +40,6 @@ func NewMikrotikController(coreCfg *config.Config, cfg *config.BackendMikrotik)

 		interfaceMutexes: sync.Map{},
 		peerMutexes:      sync.Map{},
-		coreMutex:        sync.Mutex{},
 	}, nil
 }

@@ -765,126 +763,33 @@ func (c *MikrotikController) DeletePeer(

 // region wg-quick-related

-func (c *MikrotikController) ExecuteInterfaceHook(
-	_ context.Context,
-	_ domain.InterfaceIdentifier,
-	_ string,
-) error {
+func (c *MikrotikController) ExecuteInterfaceHook(id domain.InterfaceIdentifier, hookCmd string) error {
 	// TODO implement me
-	slog.Error("interface hooks are not yet supported for Mikrotik backends, please open an issue on GitHub")
-	return nil
+	panic("implement me")
 }

-func (c *MikrotikController) SetDNS(
-	ctx context.Context,
-	_ domain.InterfaceIdentifier,
-	dnsStr, _ string,
-) error {
-	// Lock the interface to prevent concurrent modifications
-	c.coreMutex.Lock()
-	defer c.coreMutex.Unlock()
-
-	// check if the server is already configured
-	wgReply := c.client.Get(ctx, "/ip/dns", &lowlevel.MikrotikRequestOptions{
-		PropList: []string{"servers"},
-	})
-	if wgReply.Status != lowlevel.MikrotikApiStatusOk {
-		return fmt.Errorf("unable to find WireGuard dns settings: %v", wgReply.Error)
-	}
-
-	var existingServers []string
-	existingServers = append(existingServers, strings.Split(wgReply.Data.GetString("servers"), ",")...)
-
-	newServers := strings.Split(dnsStr, ",")
-
-	mergedServers := slices.Clone(existingServers)
-	for _, s := range newServers {
-		if s == "" {
-			continue
-		}
-		if !slices.Contains(mergedServers, s) {
-			mergedServers = append(mergedServers, s)
-		}
-	}
-	mergedServersStr := strings.Join(mergedServers, ",")
-
-	reply := c.client.ExecList(ctx, "/ip/dns/set", lowlevel.GenericJsonObject{
-		"servers": mergedServersStr,
-	})
-	if reply.Status != lowlevel.MikrotikApiStatusOk {
-		return fmt.Errorf("failed to set DNS servers: %s: %v", mergedServersStr, reply.Error)
-	}
-
-	return nil
+func (c *MikrotikController) SetDNS(id domain.InterfaceIdentifier, dnsStr, dnsSearchStr string) error {
+	// TODO implement me
+	panic("implement me")
 }

-func (c *MikrotikController) UnsetDNS(
-	ctx context.Context,
-	_ domain.InterfaceIdentifier,
-	dnsStr, _ string,
-) error {
-	// Lock the interface to prevent concurrent modifications
-	c.coreMutex.Lock()
-	defer c.coreMutex.Unlock()
-
-	// retrieve current DNS settings
-	wgReply := c.client.Get(ctx, "/ip/dns", &lowlevel.MikrotikRequestOptions{
-		PropList: []string{"servers"},
-	})
-	if wgReply.Status != lowlevel.MikrotikApiStatusOk {
-		return fmt.Errorf("unable to find WireGuard dns settings: %v", wgReply.Error)
-	}
-
-	var existingServers []string
-	existingServers = append(existingServers, strings.Split(wgReply.Data.GetString("servers"), ",")...)
-
-	oldServers := strings.Split(dnsStr, ",")
-
-	mergedServers := make([]string, 0, len(existingServers))
-	for _, s := range existingServers {
-		if s == "" {
-			continue
-		}
-		if !slices.Contains(oldServers, s) {
-			mergedServers = append(mergedServers, s) // only keep the servers that are not in the old list
-		}
-	}
-	mergedServersStr := strings.Join(mergedServers, ",")
-
-	reply := c.client.ExecList(ctx, "/ip/dns/set", lowlevel.GenericJsonObject{
-		"servers": mergedServersStr,
-	})
-	if reply.Status != lowlevel.MikrotikApiStatusOk {
-		return fmt.Errorf("failed to set DNS servers: %s: %v", mergedServersStr, reply.Error)
-	}
-
-	return nil
+func (c *MikrotikController) UnsetDNS(id domain.InterfaceIdentifier) error {
+	// TODO implement me
+	panic("implement me")
 }

 // endregion wg-quick-related

 // region routing-related

-// SetRoutes sets the routes for the given interface. If no routes are provided, the function is a no-op.
-func (c *MikrotikController) SetRoutes(
-	ctx context.Context,
-	interfaceId domain.InterfaceIdentifier,
-	table int,
-	fwMark uint32,
-	cidrs []domain.Cidr,
-) error {
-	return nil
+func (c *MikrotikController) SyncRouteRules(_ context.Context, rules []domain.RouteRule) error {
+	// TODO implement me
+	panic("implement me")
 }

-// RemoveRoutes removes the routes for the given interface. If no routes are provided, the function is a no-op.
-func (c *MikrotikController) RemoveRoutes(
-	ctx context.Context,
-	interfaceId domain.InterfaceIdentifier,
-	table int,
-	fwMark uint32,
-	oldCidrs []domain.Cidr,
-) error {
-	return nil
+func (c *MikrotikController) DeleteRouteRules(_ context.Context, rules []domain.RouteRule) error {
+	// TODO implement me
+	panic("implement me")
 }

 // endregion routing-related
--- a/internal/adapters/wgquick.go
+++ b/internal/adapters/wgquick.go
@@ -0,0 +1,113 @@
+package adapters
+
+import (
+	"bytes"
+	"fmt"
+	"log/slog"
+	"os/exec"
+	"strings"
+
+	"github.com/h44z/wg-portal/internal"
+	"github.com/h44z/wg-portal/internal/domain"
+)
+
+// WgQuickRepo implements higher level wg-quick like interactions like setting DNS, routing tables or interface hooks.
+type WgQuickRepo struct {
+	shellCmd              string
+	resolvConfIfacePrefix string
+}
+
+// NewWgQuickRepo creates a new WgQuickRepo instance.
+func NewWgQuickRepo() *WgQuickRepo {
+	return &WgQuickRepo{
+		shellCmd:              "bash",
+		resolvConfIfacePrefix: "tun.",
+	}
+}
+
+// ExecuteInterfaceHook executes the given hook command.
+// The hook command can contain the following placeholders:
+//
+//	%i: the interface identifier.
+func (r *WgQuickRepo) ExecuteInterfaceHook(id domain.InterfaceIdentifier, hookCmd string) error {
+	if hookCmd == "" {
+		return nil
+	}
+
+	slog.Debug("executing interface hook", "interface", id, "hook", hookCmd)
+	err := r.exec(hookCmd, id)
+	if err != nil {
+		return fmt.Errorf("failed to exec hook: %w", err)
+	}
+
+	return nil
+}
+
+// SetDNS sets the DNS settings for the given interface. It uses resolvconf to set the DNS settings.
+func (r *WgQuickRepo) SetDNS(id domain.InterfaceIdentifier, dnsStr, dnsSearchStr string) error {
+	if dnsStr == "" && dnsSearchStr == "" {
+		return nil
+	}
+
+	dnsServers := internal.SliceString(dnsStr)
+	dnsSearchDomains := internal.SliceString(dnsSearchStr)
+
+	dnsCommand := "resolvconf -a %resPref%i -m 0 -x"
+	dnsCommandInput := make([]string, 0, len(dnsServers)+len(dnsSearchDomains))
+
+	for _, dnsServer := range dnsServers {
+		dnsCommandInput = append(dnsCommandInput, fmt.Sprintf("nameserver %s", dnsServer))
+	}
+	for _, searchDomain := range dnsSearchDomains {
+		dnsCommandInput = append(dnsCommandInput, fmt.Sprintf("search %s", searchDomain))
+	}
+
+	err := r.exec(dnsCommand, id, dnsCommandInput...)
+	if err != nil {
+		return fmt.Errorf(
+			"failed to set dns settings (is resolvconf available?, for systemd create this symlink: ln -s /usr/bin/resolvectl /usr/local/bin/resolvconf): %w",
+			err,
+		)
+	}
+
+	return nil
+}
+
+// UnsetDNS unsets the DNS settings for the given interface. It uses resolvconf to unset the DNS settings.
+func (r *WgQuickRepo) UnsetDNS(id domain.InterfaceIdentifier) error {
+	dnsCommand := "resolvconf -d %resPref%i -f"
+
+	err := r.exec(dnsCommand, id)
+	if err != nil {
+		return fmt.Errorf("failed to unset dns settings: %w", err)
+	}
+
+	return nil
+}
+
+func (r *WgQuickRepo) replaceCommandPlaceHolders(command string, interfaceId domain.InterfaceIdentifier) string {
+	command = strings.ReplaceAll(command, "%resPref", r.resolvConfIfacePrefix)
+	return strings.ReplaceAll(command, "%i", string(interfaceId))
+}
+
+func (r *WgQuickRepo) exec(command string, interfaceId domain.InterfaceIdentifier, stdin ...string) error {
+	commandWithInterfaceName := r.replaceCommandPlaceHolders(command, interfaceId)
+	cmd := exec.Command(r.shellCmd, "-ce", commandWithInterfaceName)
+	if len(stdin) > 0 {
+		b := &bytes.Buffer{}
+		for _, ln := range stdin {
+			if _, err := fmt.Fprint(b, ln); err != nil {
+				return err
+			}
+		}
+		cmd.Stdin = b
+	}
+	out, err := cmd.CombinedOutput() // execute and wait for output
+	if err != nil {
+		return fmt.Errorf("failed to exexute shell command %s: %w", commandWithInterfaceName, err)
+	}
+	slog.Debug("executed shell command",
+		"command", commandWithInterfaceName,
+		"output", string(out))
+	return nil
+}
--- a/internal/app/auth/auth.go
+++ b/internal/app/auth/auth.go
@@ -125,27 +125,11 @@ func NewAuthenticator(cfg *config.Auth, extUrl string, bus EventBus, users UserM
 // It sets up the external authentication providers (OIDC, OAuth, LDAP) and retries in case of errors.
 func (a *Authenticator) StartBackgroundJobs(ctx context.Context) {
 	go func() {
-		slog.Debug("setting up external auth providers...")
-
 		// Initialize local copies of authentication providers to allow retry in case of errors
 		oidcQueue := a.cfg.OpenIDConnect
 		oauthQueue := a.cfg.OAuth
 		ldapQueue := a.cfg.Ldap

-		// Immediate attempt
-		failedOidc, failedOauth, failedLdap := a.setupExternalAuthProviders(oidcQueue, oauthQueue, ldapQueue)
-		if len(failedOidc) == 0 && len(failedOauth) == 0 && len(failedLdap) == 0 {
-			slog.Info("successfully setup all external auth providers")
-			return
-		}
-
-		// Prepare for retries with only the failed ones
-		oidcQueue = failedOidc
-		oauthQueue = failedOauth
-		ldapQueue = failedLdap
-		slog.Warn("failed to setup some external auth providers, retrying in 30 seconds",
-			"failedOidc", len(failedOidc), "failedOauth", len(failedOauth), "failedLdap", len(failedLdap))
-
 		ticker := time.NewTicker(30 * time.Second) // Ticker for delay between retries
 		defer ticker.Stop()

@@ -374,15 +358,13 @@ func (a *Authenticator) passwordAuthentication(
 			rawUserInfo, err := ldapAuth.GetUserInfo(context.Background(), identifier)
 			if err != nil {
 				if !errors.Is(err, domain.ErrNotFound) {
-					slog.Warn("failed to fetch ldap user info",
-						"source", ldapAuth.GetName(), "identifier", identifier, "error", err)
+					slog.Warn("failed to fetch ldap user info", "identifier", identifier, "error", err)
 				}
 				continue // user not found / other ldap error
 			}
 			ldapUserInfo, err = ldapAuth.ParseUserInfo(rawUserInfo)
 			if err != nil {
-				slog.Error("failed to parse ldap user info",
-					"source", ldapAuth.GetName(), "identifier", identifier, "error", err)
+				slog.Error("failed to parse ldap user info", "identifier", identifier, "error", err)
 				continue
 			}

@@ -395,14 +377,13 @@ func (a *Authenticator) passwordAuthentication(
 	}

 	if userSource == "" {
-		slog.Warn("no user source found for user",
-			"identifier", identifier, "ldapProviderCount", len(a.ldapAuthenticators), "inDb", userInDatabase)
+		slog.Warn("no user source found for user", "identifier", identifier, "ldapProviderCount", a.ldapAuthenticators)
 		return nil, errors.New("user not found")
 	}

 	if userSource == domain.UserSourceLdap && ldapProvider == nil {
 		slog.Warn("no ldap provider found for user",
-			"identifier", identifier, "ldapProviderCount", len(a.ldapAuthenticators), "inDb", userInDatabase)
+			"identifier", identifier, "ldapProviderCount", a.ldapAuthenticators)
 		return nil, errors.New("ldap provider not found")
 	}

--- a/internal/app/auth/auth_ldap.go
+++ b/internal/app/auth/auth_ldap.go
@@ -113,13 +113,10 @@ func (l LdapAuthenticator) GetUserInfo(_ context.Context, userId domain.UserIden
 	}

 	if len(sr.Entries) == 0 {
-		slog.Debug("LDAP user not found", "source", l.GetName(), "userId", userId, "filter", loginFilter)
 		return nil, domain.ErrNotFound
 	}

 	if len(sr.Entries) > 1 {
-		slog.Debug("LDAP user not unique",
-			"source", l.GetName(), "userId", userId, "filter", loginFilter, "entries", len(sr.Entries))
 		return nil, domain.ErrNotUnique
 	}

--- a/internal/app/route/routes.go
+++ b/internal/app/route/routes.go
@@ -5,21 +5,24 @@ import (
 	"fmt"
 	"log/slog"

+	"github.com/vishvananda/netlink"
+	"golang.org/x/sys/unix"
+	"golang.zx2c4.com/wireguard/wgctrl"
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+
 	"github.com/h44z/wg-portal/internal/app"
 	"github.com/h44z/wg-portal/internal/config"
 	"github.com/h44z/wg-portal/internal/domain"
+	"github.com/h44z/wg-portal/internal/lowlevel"
 )

 // region dependencies

-type ControllerManager interface {
-	// GetController returns the controller for the given interface.
-	GetController(iface domain.Interface) domain.InterfaceController
-}
-
 type InterfaceAndPeerDatabaseRepo interface {
-	// GetInterface returns the interface with the given identifier.
-	GetInterface(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Interface, error)
+	// GetAllInterfaces returns all interfaces
+	GetAllInterfaces(ctx context.Context) ([]domain.Interface, error)
+	// GetInterfacePeers returns all peers for a given interface
+	GetInterfacePeers(ctx context.Context, id domain.InterfaceIdentifier) ([]domain.Peer, error)
 }

 type EventBus interface {
@@ -27,25 +30,6 @@ type EventBus interface {
 	Subscribe(topic string, fn interface{}) error
 }

-type RoutesController interface {
-	// SetRoutes sets the routes for the given interface. If no routes are provided, the function is a no-op.
-	SetRoutes(
-		ctx context.Context,
-		interfaceId domain.InterfaceIdentifier,
-		table int,
-		fwMark uint32,
-		cidrs []domain.Cidr,
-	) error
-	// RemoveRoutes removes the routes for the given interface. If no routes are provided, the function is a no-op.
-	RemoveRoutes(
-		ctx context.Context,
-		interfaceId domain.InterfaceIdentifier,
-		table int,
-		fwMark uint32,
-		oldCidrs []domain.Cidr,
-	) error
-}
-
 // endregion dependencies

 type routeRuleInfo struct {
@@ -61,24 +45,28 @@ type routeRuleInfo struct {
 type Manager struct {
 	cfg *config.Config

-	bus          EventBus
-	db           InterfaceAndPeerDatabaseRepo
-	wgController ControllerManager
+	bus EventBus
+	wg  lowlevel.WireGuardClient
+	nl  lowlevel.NetlinkClient
+	db  InterfaceAndPeerDatabaseRepo
 }

 // NewRouteManager creates a new route manager instance.
-func NewRouteManager(
-	cfg *config.Config,
-	bus EventBus,
-	db InterfaceAndPeerDatabaseRepo,
-	wgController ControllerManager,
-) (*Manager, error) {
+func NewRouteManager(cfg *config.Config, bus EventBus, db InterfaceAndPeerDatabaseRepo) (*Manager, error) {
+	wg, err := wgctrl.New()
+	if err != nil {
+		panic("failed to init wgctrl: " + err.Error())
+	}
+
+	nl := &lowlevel.NetlinkManager{}
+
 	m := &Manager{
 		cfg: cfg,
 		bus: bus,

-		db:           db,
-		wgController: wgController,
+		db: db,
+		wg: wg,
+		nl: nl,
 	}

 	m.connectToMessageBus()
@@ -97,21 +85,17 @@ func (m Manager) StartBackgroundJobs(_ context.Context) {
 	// this is a no-op for now
 }

-func (m Manager) handleRouteUpdateEvent(info domain.RoutingTableInfo) {
-	slog.Debug("handling route update event", "info", info.String())
+func (m Manager) handleRouteUpdateEvent(srcDescription string) {
+	slog.Debug("handling route update event", "source", srcDescription)

-	if !info.ManagementEnabled() {
-		return // route management disabled
-	}
-
-	err := m.syncRoutes(context.Background(), info)
+	err := m.syncRoutes(context.Background())
 	if err != nil {
 		slog.Error("failed to synchronize routes",
-			"info", info.String(), "error", err)
-		return
+			"source", srcDescription,
+			"error", err)
 	}

-	slog.Debug("routes synchronized", "info", info.String())
+	slog.Debug("routes synchronized", "source", srcDescription)
 }

 func (m Manager) handleRouteRemoveEvent(info domain.RoutingTableInfo) {
@@ -121,40 +105,399 @@ func (m Manager) handleRouteRemoveEvent(info domain.RoutingTableInfo) {
 		return // route management disabled
 	}

-	err := m.removeRoutes(context.Background(), info)
-	if err != nil {
-		slog.Error("failed to synchronize routes",
-			"info", info.String(), "error", err)
-		return
+	if err := m.removeFwMarkRules(info.FwMark, info.GetRoutingTable(), netlink.FAMILY_V4); err != nil {
+		slog.Error("failed to remove v4 fwmark rules", "error", err)
+	}
+	if err := m.removeFwMarkRules(info.FwMark, info.GetRoutingTable(), netlink.FAMILY_V6); err != nil {
+		slog.Error("failed to remove v6 fwmark rules", "error", err)
 	}

-	slog.Debug("routes removed", "info", info.String())
+	slog.Debug("routes removed", "table", info.String())
 }

-func (m Manager) syncRoutes(ctx context.Context, info domain.RoutingTableInfo) error {
-	rc, ok := m.wgController.GetController(info.Interface).(RoutesController)
-	if !ok {
-		slog.Warn("no capable routes-controller found for interface", "interface", info.Interface.Identifier)
-		return nil
+func (m Manager) syncRoutes(ctx context.Context) error {
+	interfaces, err := m.db.GetAllInterfaces(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to find all interfaces: %w", err)
 	}

-	err := rc.SetRoutes(ctx, info.Interface.Identifier, info.Table, info.FwMark, info.AllowedIps)
-	if err != nil {
-		return fmt.Errorf("failed to set routes for interface %s: %w", info.Interface.Identifier, err)
+	rules := map[int][]routeRuleInfo{
+		netlink.FAMILY_V4: nil,
+		netlink.FAMILY_V6: nil,
+	}
+	for _, iface := range interfaces {
+		if iface.IsDisabled() {
+			continue // disabled interface does not need route entries
+		}
+		if !iface.ManageRoutingTable() {
+			continue
+		}
+
+		peers, err := m.db.GetInterfacePeers(ctx, iface.Identifier)
+		if err != nil {
+			return fmt.Errorf("failed to find peers for %s: %w", iface.Identifier, err)
+		}
+		allowedIPs := iface.GetAllowedIPs(peers)
+		defRouteV4, defRouteV6 := m.containsDefaultRoute(allowedIPs)
+
+		link, err := m.nl.LinkByName(string(iface.Identifier))
+		if err != nil {
+			return fmt.Errorf("failed to find physical link for %s: %w", iface.Identifier, err)
+		}
+
+		table, fwmark, err := m.getRoutingTableAndFwMark(&iface, link)
+		if err != nil {
+			return fmt.Errorf("failed to get table and fwmark for %s: %w", iface.Identifier, err)
+		}
+
+		if err := m.setInterfaceRoutes(link, table, allowedIPs); err != nil {
+			return fmt.Errorf("failed to set routes for %s: %w", iface.Identifier, err)
+		}
+
+		if err := m.removeDeprecatedRoutes(link, netlink.FAMILY_V4, allowedIPs); err != nil {
+			return fmt.Errorf("failed to remove deprecated v4 routes for %s: %w", iface.Identifier, err)
+		}
+		if err := m.removeDeprecatedRoutes(link, netlink.FAMILY_V6, allowedIPs); err != nil {
+			return fmt.Errorf("failed to remove deprecated v6 routes for %s: %w", iface.Identifier, err)
+		}
+
+		if table != 0 {
+			rules[netlink.FAMILY_V4] = append(rules[netlink.FAMILY_V4], routeRuleInfo{
+				ifaceId:    iface.Identifier,
+				fwMark:     fwmark,
+				table:      table,
+				family:     netlink.FAMILY_V4,
+				hasDefault: defRouteV4,
+			})
+		}
+		if table != 0 {
+			rules[netlink.FAMILY_V6] = append(rules[netlink.FAMILY_V6], routeRuleInfo{
+				ifaceId:    iface.Identifier,
+				fwMark:     fwmark,
+				table:      table,
+				family:     netlink.FAMILY_V6,
+				hasDefault: defRouteV6,
+			})
+		}
+	}
+
+	return m.syncRouteRules(rules)
+}
+
+func (m Manager) syncRouteRules(allRules map[int][]routeRuleInfo) error {
+	for family, rules := range allRules {
+		// update fwmark rules
+		if err := m.setFwMarkRules(rules, family); err != nil {
+			return err
+		}
+
+		// update main rule
+		if err := m.setMainRule(rules, family); err != nil {
+			return err
+		}
+
+		// cleanup old main rules
+		if err := m.cleanupMainRule(rules, family); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m Manager) setFwMarkRules(rules []routeRuleInfo, family int) error {
+	for _, rule := range rules {
+		existingRules, err := m.nl.RuleList(family)
+		if err != nil {
+			return fmt.Errorf("failed to get existing rules for family %d: %w", family, err)
+		}
+
+		ruleExists := false
+		for _, existingRule := range existingRules {
+			if rule.fwMark == existingRule.Mark && rule.table == existingRule.Table {
+				ruleExists = true
+				break
+			}
+		}
+
+		if ruleExists {
+			continue // rule already exists, no need to recreate it
+		}
+
+		// create missing rule
+		if err := m.nl.RuleAdd(&netlink.Rule{
+			Family:            family,
+			Table:             rule.table,
+			Mark:              rule.fwMark,
+			Invert:            true,
+			SuppressIfgroup:   -1,
+			SuppressPrefixlen: -1,
+			Priority:          m.getRulePriority(existingRules),
+			Mask:              nil,
+			Goto:              -1,
+			Flow:              -1,
+		}); err != nil {
+			return fmt.Errorf("failed to setup rule for fwmark %d and table %d: %w", rule.fwMark, rule.table, err)
+		}
 	}
 	return nil
 }

-func (m Manager) removeRoutes(ctx context.Context, info domain.RoutingTableInfo) error {
-	rc, ok := m.wgController.GetController(info.Interface).(RoutesController)
-	if !ok {
-		slog.Warn("no capable routes-controller found for interface", "interface", info.Interface.Identifier)
-		return nil
+func (m Manager) removeFwMarkRules(fwmark uint32, table int, family int) error {
+	existingRules, err := m.nl.RuleList(family)
+	if err != nil {
+		return fmt.Errorf("failed to get existing rules for family %d: %w", family, err)
 	}

-	err := rc.RemoveRoutes(ctx, info.Interface.Identifier, info.Table, info.FwMark, info.AllowedIps)
-	if err != nil {
-		return fmt.Errorf("failed to remove routes for interface %s: %w", info.Interface.Identifier, err)
+	for _, existingRule := range existingRules {
+		if fwmark == existingRule.Mark && table == existingRule.Table {
+			existingRule.Family = family // set family, somehow the RuleList method does not populate the family field
+			if err := m.nl.RuleDel(&existingRule); err != nil {
+				return fmt.Errorf("failed to delete fwmark rule: %w", err)
+			}
+		}
 	}
 	return nil
 }
+
+func (m Manager) setMainRule(rules []routeRuleInfo, family int) error {
+	shouldHaveMainRule := false
+	for _, rule := range rules {
+		if rule.hasDefault == true {
+			shouldHaveMainRule = true
+			break
+		}
+	}
+	if !shouldHaveMainRule {
+		return nil
+	}
+
+	existingRules, err := m.nl.RuleList(family)
+	if err != nil {
+		return fmt.Errorf("failed to get existing rules for family %d: %w", family, err)
+	}
+
+	ruleExists := false
+	for _, existingRule := range existingRules {
+		if existingRule.Table == unix.RT_TABLE_MAIN && existingRule.SuppressPrefixlen == 0 {
+			ruleExists = true
+			break
+		}
+	}
+
+	if ruleExists {
+		return nil // rule already exists, skip re-creation
+	}
+
+	if err := m.nl.RuleAdd(&netlink.Rule{
+		Family:            family,
+		Table:             unix.RT_TABLE_MAIN,
+		SuppressIfgroup:   -1,
+		SuppressPrefixlen: 0,
+		Priority:          m.getMainRulePriority(existingRules),
+		Mark:              0,
+		Mask:              nil,
+		Goto:              -1,
+		Flow:              -1,
+	}); err != nil {
+		return fmt.Errorf("failed to setup rule for main table: %w", err)
+	}
+
+	return nil
+}
+
+func (m Manager) cleanupMainRule(rules []routeRuleInfo, family int) error {
+	existingRules, err := m.nl.RuleList(family)
+	if err != nil {
+		return fmt.Errorf("failed to get existing rules for family %d: %w", family, err)
+	}
+
+	shouldHaveMainRule := false
+	for _, rule := range rules {
+		if rule.hasDefault == true {
+			shouldHaveMainRule = true
+			break
+		}
+	}
+
+	mainRules := 0
+	for _, existingRule := range existingRules {
+		if existingRule.Table == unix.RT_TABLE_MAIN && existingRule.SuppressPrefixlen == 0 {
+			mainRules++
+		}
+	}
+
+	removalCount := 0
+	if mainRules > 1 {
+		removalCount = mainRules - 1 // we only want one single rule
+	}
+	if !shouldHaveMainRule {
+		removalCount = mainRules
+	}
+
+	for _, existingRule := range existingRules {
+		if existingRule.Table == unix.RT_TABLE_MAIN && existingRule.SuppressPrefixlen == 0 {
+			if removalCount > 0 {
+				existingRule.Family = family // set family, somehow the RuleList method does not populate the family field
+				if err := m.nl.RuleDel(&existingRule); err != nil {
+					return fmt.Errorf("failed to delete main rule: %w", err)
+				}
+				removalCount--
+			}
+		}
+	}
+
+	return nil
+}
+
+func (m Manager) getMainRulePriority(existingRules []netlink.Rule) int {
+	prio := m.cfg.Advanced.RulePrioOffset
+	for {
+		isFresh := true
+		for _, existingRule := range existingRules {
+			if existingRule.Priority == prio {
+				isFresh = false
+				break
+			}
+		}
+		if isFresh {
+			break
+		} else {
+			prio++
+		}
+	}
+	return prio
+}
+
+func (m Manager) getRulePriority(existingRules []netlink.Rule) int {
+	prio := 32700 // linux main rule has a prio of 32766
+	for {
+		isFresh := true
+		for _, existingRule := range existingRules {
+			if existingRule.Priority == prio {
+				isFresh = false
+				break
+			}
+		}
+		if isFresh {
+			break
+		} else {
+			prio--
+		}
+	}
+	return prio
+}
+
+func (m Manager) setInterfaceRoutes(link netlink.Link, table int, allowedIPs []domain.Cidr) error {
+	for _, allowedIP := range allowedIPs {
+		err := m.nl.RouteReplace(&netlink.Route{
+			LinkIndex: link.Attrs().Index,
+			Dst:       allowedIP.IpNet(),
+			Table:     table,
+			Scope:     unix.RT_SCOPE_LINK,
+			Type:      unix.RTN_UNICAST,
+		})
+		if err != nil {
+			return fmt.Errorf("failed to add/update route %s: %w", allowedIP.String(), err)
+		}
+	}
+
+	return nil
+}
+
+func (m Manager) removeDeprecatedRoutes(link netlink.Link, family int, allowedIPs []domain.Cidr) error {
+	rawRoutes, err := m.nl.RouteListFiltered(family, &netlink.Route{
+		LinkIndex: link.Attrs().Index,
+		Table:     unix.RT_TABLE_UNSPEC, // all tables
+		Scope:     unix.RT_SCOPE_LINK,
+		Type:      unix.RTN_UNICAST,
+	}, netlink.RT_FILTER_TABLE|netlink.RT_FILTER_TYPE|netlink.RT_FILTER_OIF)
+	if err != nil {
+		return fmt.Errorf("failed to fetch raw routes: %w", err)
+	}
+	for _, rawRoute := range rawRoutes {
+		if rawRoute.Dst == nil { // handle default route
+			var netlinkAddr domain.Cidr
+			if family == netlink.FAMILY_V4 {
+				netlinkAddr, _ = domain.CidrFromString("0.0.0.0/0")
+			} else {
+				netlinkAddr, _ = domain.CidrFromString("::/0")
+			}
+			rawRoute.Dst = netlinkAddr.IpNet()
+		}
+
+		netlinkAddr := domain.CidrFromIpNet(*rawRoute.Dst)
+		remove := true
+		for _, allowedIP := range allowedIPs {
+			if netlinkAddr == allowedIP {
+				remove = false
+				break
+			}
+		}
+
+		if !remove {
+			continue
+		}
+
+		err := m.nl.RouteDel(&rawRoute)
+		if err != nil {
+			return fmt.Errorf("failed to remove deprecated route %s: %w", netlinkAddr.String(), err)
+		}
+	}
+	return nil
+}
+
+func (m Manager) getRoutingTableAndFwMark(iface *domain.Interface, link netlink.Link) (
+	table int,
+	fwmark uint32,
+	err error,
+) {
+	table = iface.GetRoutingTable()
+	fwmark = iface.FirewallMark
+
+	if fwmark == 0 {
+		// generate a new (temporary) firewall mark based on the interface index
+		fwmark = uint32(m.cfg.Advanced.RouteTableOffset + link.Attrs().Index)
+		slog.Debug("using fwmark to handle routes",
+			"interface", iface.Identifier,
+			"fwmark", fwmark)
+
+		// apply the temporary fwmark to the wireguard interface
+		err = m.setFwMark(iface.Identifier, int(fwmark))
+	}
+	if table == 0 {
+		table = int(fwmark) // generate a new routing table base on interface index
+		slog.Debug("using routing table to handle default routes",
+			"interface", iface.Identifier,
+			"table", table)
+	}
+	return
+}
+
+func (m Manager) setFwMark(id domain.InterfaceIdentifier, fwmark int) error {
+	err := m.wg.ConfigureDevice(string(id), wgtypes.Config{
+		FirewallMark: &fwmark,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to update fwmark to: %d: %w", fwmark, err)
+	}
+	return nil
+}
+
+func (m Manager) containsDefaultRoute(allowedIPs []domain.Cidr) (ipV4, ipV6 bool) {
+	for _, allowedIP := range allowedIPs {
+		if ipV4 && ipV6 {
+			break // speed up
+		}
+
+		if allowedIP.Prefix().Bits() == 0 {
+			if allowedIP.IsV4() {
+				ipV4 = true
+			} else {
+				ipV6 = true
+			}
+		}
+	}
+
+	return
+}
--- a/internal/app/wireguard/controller_manager.go
+++ b/internal/app/wireguard/controller_manager.go
@@ -1,6 +1,7 @@
 package wireguard

 import (
+	"context"
 	"fmt"
 	"log/slog"
 	"maps"
@@ -11,9 +12,33 @@ import (
 	"github.com/h44z/wg-portal/internal/domain"
 )

+type InterfaceController interface {
+	GetId() domain.InterfaceBackend
+	GetInterfaces(_ context.Context) ([]domain.PhysicalInterface, error)
+	GetInterface(_ context.Context, id domain.InterfaceIdentifier) (*domain.PhysicalInterface, error)
+	GetPeers(_ context.Context, deviceId domain.InterfaceIdentifier) ([]domain.PhysicalPeer, error)
+	SaveInterface(
+		_ context.Context,
+		id domain.InterfaceIdentifier,
+		updateFunc func(pi *domain.PhysicalInterface) (*domain.PhysicalInterface, error),
+	) error
+	DeleteInterface(_ context.Context, id domain.InterfaceIdentifier) error
+	SavePeer(
+		_ context.Context,
+		deviceId domain.InterfaceIdentifier,
+		id domain.PeerIdentifier,
+		updateFunc func(pp *domain.PhysicalPeer) (*domain.PhysicalPeer, error),
+	) error
+	DeletePeer(_ context.Context, deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier) error
+	PingAddresses(
+		ctx context.Context,
+		addr string,
+	) (*domain.PingerResult, error)
+}
+
 type backendInstance struct {
 	Config         config.BackendBase // Config is the configuration for the backend instance.
-	Implementation domain.InterfaceController
+	Implementation InterfaceController
 }

 type ControllerManager struct {
@@ -93,11 +118,11 @@ func (c *ControllerManager) logRegisteredControllers() {
 	}
 }

-func (c *ControllerManager) GetControllerByName(backend domain.InterfaceBackend) domain.InterfaceController {
+func (c *ControllerManager) GetControllerByName(backend domain.InterfaceBackend) InterfaceController {
 	return c.getController(backend, "").Implementation
 }

-func (c *ControllerManager) GetController(iface domain.Interface) domain.InterfaceController {
+func (c *ControllerManager) GetController(iface domain.Interface) InterfaceController {
 	return c.getController(iface.Backend, iface.Identifier).Implementation
 }

--- a/internal/app/wireguard/wireguard.go
+++ b/internal/app/wireguard/wireguard.go
@@ -38,9 +38,9 @@ type InterfaceAndPeerDatabaseRepo interface {
 }

 type WgQuickController interface {
-	ExecuteInterfaceHook(ctx context.Context, id domain.InterfaceIdentifier, hookCmd string) error
-	SetDNS(ctx context.Context, id domain.InterfaceIdentifier, dnsStr, dnsSearchStr string) error
-	UnsetDNS(ctx context.Context, id domain.InterfaceIdentifier, dnsStr, dnsSearchStr string) error
+	ExecuteInterfaceHook(id domain.InterfaceIdentifier, hookCmd string) error
+	SetDNS(id domain.InterfaceIdentifier, dnsStr, dnsSearchStr string) error
+	UnsetDNS(id domain.InterfaceIdentifier) error
 }

 type EventBus interface {
@@ -53,10 +53,11 @@ type EventBus interface {
 // endregion dependencies

 type Manager struct {
-	cfg *config.Config
-	bus EventBus
-	db  InterfaceAndPeerDatabaseRepo
-	wg  *ControllerManager
+	cfg   *config.Config
+	bus   EventBus
+	db    InterfaceAndPeerDatabaseRepo
+	wg    *ControllerManager
+	quick WgQuickController

 	userLockMap *sync.Map
 }
@@ -65,6 +66,7 @@ func NewWireGuardManager(
 	cfg *config.Config,
 	bus EventBus,
 	wg *ControllerManager,
+	quick WgQuickController,
 	db InterfaceAndPeerDatabaseRepo,
 ) (*Manager, error) {
 	m := &Manager{
@@ -72,6 +74,7 @@ func NewWireGuardManager(
 		bus:         bus,
 		wg:          wg,
 		db:          db,
+		quick:       quick,
 		userLockMap: &sync.Map{},
 	}

--- a/internal/app/wireguard/wireguard_interfaces.go
+++ b/internal/app/wireguard/wireguard_interfaces.go
@@ -453,7 +453,7 @@ func (m Manager) DeleteInterface(ctx context.Context, id domain.InterfaceIdentif
 		return err
 	}

-	existingInterface, existingPeers, err := m.db.GetInterfaceAndPeers(ctx, id)
+	existingInterface, err := m.db.GetInterface(ctx, id)
 	if err != nil {
 		return fmt.Errorf("unable to find interface %s: %w", id, err)
 	}
@@ -468,16 +468,15 @@ func (m Manager) DeleteInterface(ctx context.Context, id domain.InterfaceIdentif

 	physicalInterface, _ := m.wg.GetController(*existingInterface).GetInterface(ctx, id)

-	if err := m.handleInterfacePreSaveHooks(ctx, existingInterface, !existingInterface.IsDisabled(),
-		false); err != nil {
+	if err := m.handleInterfacePreSaveHooks(existingInterface, !existingInterface.IsDisabled(), false); err != nil {
 		return fmt.Errorf("pre-delete hooks failed: %w", err)
 	}

-	if err := m.handleInterfacePreSaveActions(ctx, existingInterface); err != nil {
+	if err := m.handleInterfacePreSaveActions(existingInterface); err != nil {
 		return fmt.Errorf("pre-delete actions failed: %w", err)
 	}

-	if err := m.deleteInterfacePeers(ctx, existingInterface, existingPeers); err != nil {
+	if err := m.deleteInterfacePeers(ctx, id); err != nil {
 		return fmt.Errorf("peer deletion failure: %w", err)
 	}

@@ -494,18 +493,11 @@ func (m Manager) DeleteInterface(ctx context.Context, id domain.InterfaceIdentif
 		fwMark = physicalInterface.FirewallMark
 	}
 	m.bus.Publish(app.TopicRouteRemove, domain.RoutingTableInfo{
-		Interface:  *existingInterface,
-		AllowedIps: existingInterface.GetAllowedIPs(existingPeers),
-		FwMark:     fwMark,
-		Table:      existingInterface.GetRoutingTable(),
+		FwMark: fwMark,
+		Table:  existingInterface.GetRoutingTable(),
 	})

-	if err := m.handleInterfacePostSaveHooks(
-		ctx,
-		existingInterface,
-		!existingInterface.IsDisabled(),
-		false,
-	); err != nil {
+	if err := m.handleInterfacePostSaveHooks(existingInterface, !existingInterface.IsDisabled(), false); err != nil {
 		return fmt.Errorf("post-delete hooks failed: %w", err)
 	}

@@ -526,11 +518,11 @@ func (m Manager) saveInterface(ctx context.Context, iface *domain.Interface) (

 	oldEnabled, newEnabled := m.getInterfaceStateHistory(ctx, iface)

-	if err := m.handleInterfacePreSaveHooks(ctx, iface, oldEnabled, newEnabled); err != nil {
+	if err := m.handleInterfacePreSaveHooks(iface, oldEnabled, newEnabled); err != nil {
 		return nil, fmt.Errorf("pre-save hooks failed: %w", err)
 	}

-	if err := m.handleInterfacePreSaveActions(ctx, iface); err != nil {
+	if err := m.handleInterfacePreSaveActions(iface); err != nil {
 		return nil, fmt.Errorf("pre-save actions failed: %w", err)
 	}

@@ -583,21 +575,14 @@ func (m Manager) saveInterface(ctx context.Context, iface *domain.Interface) (
 			fwMark = physicalInterface.FirewallMark
 		}
 		m.bus.Publish(app.TopicRouteRemove, domain.RoutingTableInfo{
-			Interface:  *iface,
-			AllowedIps: iface.GetAllowedIPs(peers),
-			FwMark:     fwMark,
-			Table:      iface.GetRoutingTable(),
+			FwMark: fwMark,
+			Table:  iface.GetRoutingTable(),
 		})
 	} else {
-		m.bus.Publish(app.TopicRouteUpdate, domain.RoutingTableInfo{
-			Interface:  *iface,
-			AllowedIps: iface.GetAllowedIPs(peers),
-			FwMark:     iface.FirewallMark,
-			Table:      iface.GetRoutingTable(),
-		})
+		m.bus.Publish(app.TopicRouteUpdate, "interface updated: "+string(iface.Identifier))
 	}

-	if err := m.handleInterfacePostSaveHooks(ctx, iface, oldEnabled, newEnabled); err != nil {
+	if err := m.handleInterfacePostSaveHooks(iface, oldEnabled, newEnabled); err != nil {
 		return nil, fmt.Errorf("post-save hooks failed: %w", err)
 	}

@@ -642,83 +627,51 @@ func (m Manager) getInterfaceStateHistory(ctx context.Context, iface *domain.Int
 	return !oldInterface.IsDisabled(), !iface.IsDisabled()
 }

-func (m Manager) handleInterfacePreSaveActions(ctx context.Context, iface *domain.Interface) error {
-	wgQuickController, ok := m.wg.GetController(*iface).(WgQuickController)
-	if !ok {
-		slog.Warn("failed to perform pre-save actions", "interface", iface.Identifier,
-			"error", "no capable controller found")
-		return nil
-	}
-
-	// update DNS settings only for client interfaces
-	if iface.Type == domain.InterfaceTypeClient || iface.Type == domain.InterfaceTypeAny {
-		if !iface.IsDisabled() {
-			if err := wgQuickController.SetDNS(ctx, iface.Identifier, iface.DnsStr, iface.DnsSearchStr); err != nil {
-				return fmt.Errorf("failed to update dns settings: %w", err)
-			}
-		} else {
-			if err := wgQuickController.UnsetDNS(ctx, iface.Identifier, iface.DnsStr, iface.DnsSearchStr); err != nil {
-				return fmt.Errorf("failed to clear dns settings: %w", err)
-			}
+func (m Manager) handleInterfacePreSaveActions(iface *domain.Interface) error {
+	if !iface.IsDisabled() {
+		if err := m.quick.SetDNS(iface.Identifier, iface.DnsStr, iface.DnsSearchStr); err != nil {
+			return fmt.Errorf("failed to update dns settings: %w", err)
+		}
+	} else {
+		if err := m.quick.UnsetDNS(iface.Identifier); err != nil {
+			return fmt.Errorf("failed to clear dns settings: %w", err)
 		}
 	}
 	return nil
 }

-func (m Manager) handleInterfacePreSaveHooks(
-	ctx context.Context,
-	iface *domain.Interface,
-	oldEnabled, newEnabled bool,
-) error {
+func (m Manager) handleInterfacePreSaveHooks(iface *domain.Interface, oldEnabled, newEnabled bool) error {
 	if oldEnabled == newEnabled {
 		return nil // do nothing if state did not change
 	}

 	slog.Debug("executing pre-save hooks", "interface", iface.Identifier, "up", newEnabled)

-	wgQuickController, ok := m.wg.GetController(*iface).(WgQuickController)
-	if !ok {
-		slog.Warn("failed to execute pre-save hooks", "interface", iface.Identifier, "up", newEnabled,
-			"error", "no capable controller found")
-		return nil
-	}
-
 	if newEnabled {
-		if err := wgQuickController.ExecuteInterfaceHook(ctx, iface.Identifier, iface.PreUp); err != nil {
+		if err := m.quick.ExecuteInterfaceHook(iface.Identifier, iface.PreUp); err != nil {
 			return fmt.Errorf("failed to execute pre-up hook: %w", err)
 		}
 	} else {
-		if err := wgQuickController.ExecuteInterfaceHook(ctx, iface.Identifier, iface.PreDown); err != nil {
+		if err := m.quick.ExecuteInterfaceHook(iface.Identifier, iface.PreDown); err != nil {
 			return fmt.Errorf("failed to execute pre-down hook: %w", err)
 		}
 	}
 	return nil
 }

-func (m Manager) handleInterfacePostSaveHooks(
-	ctx context.Context,
-	iface *domain.Interface,
-	oldEnabled, newEnabled bool,
-) error {
+func (m Manager) handleInterfacePostSaveHooks(iface *domain.Interface, oldEnabled, newEnabled bool) error {
 	if oldEnabled == newEnabled {
 		return nil // do nothing if state did not change
 	}

 	slog.Debug("executing post-save hooks", "interface", iface.Identifier, "up", newEnabled)

-	wgQuickController, ok := m.wg.GetController(*iface).(WgQuickController)
-	if !ok {
-		slog.Warn("failed to execute post-save hooks", "interface", iface.Identifier, "up", newEnabled,
-			"error", "no capable controller found")
-		return nil
-	}
-
 	if newEnabled {
-		if err := wgQuickController.ExecuteInterfaceHook(ctx, iface.Identifier, iface.PostUp); err != nil {
+		if err := m.quick.ExecuteInterfaceHook(iface.Identifier, iface.PostUp); err != nil {
 			return fmt.Errorf("failed to execute post-up hook: %w", err)
 		}
 	} else {
-		if err := wgQuickController.ExecuteInterfaceHook(ctx, iface.Identifier, iface.PostDown); err != nil {
+		if err := m.quick.ExecuteInterfaceHook(iface.Identifier, iface.PostDown); err != nil {
 			return fmt.Errorf("failed to execute post-down hook: %w", err)
 		}
 	}
@@ -846,7 +799,7 @@ func (m Manager) getFreshListenPort(ctx context.Context) (port int, err error) {

 func (m Manager) importInterface(
 	ctx context.Context,
-	backend domain.InterfaceController,
+	backend InterfaceController,
 	in *domain.PhysicalInterface,
 	peers []domain.PhysicalPeer,
 ) error {
@@ -948,9 +901,13 @@ func (m Manager) importPeer(ctx context.Context, in *domain.Interface, p *domain
 	return nil
 }

-func (m Manager) deleteInterfacePeers(ctx context.Context, iface *domain.Interface, allPeers []domain.Peer) error {
+func (m Manager) deleteInterfacePeers(ctx context.Context, id domain.InterfaceIdentifier) error {
+	iface, allPeers, err := m.db.GetInterfaceAndPeers(ctx, id)
+	if err != nil {
+		return err
+	}
 	for _, peer := range allPeers {
-		err := m.wg.GetController(*iface).DeletePeer(ctx, iface.Identifier, peer.Identifier)
+		err = m.wg.GetController(*iface).DeletePeer(ctx, id, peer.Identifier)
 		if err != nil && !errors.Is(err, os.ErrNotExist) {
 			return fmt.Errorf("wireguard peer deletion failure for %s: %w", peer.Identifier, err)
 		}
--- a/internal/app/wireguard/wireguard_peers.go
+++ b/internal/app/wireguard/wireguard_peers.go
@@ -388,19 +388,9 @@ func (m Manager) DeletePeer(ctx context.Context, id domain.PeerIdentifier) error
 		return fmt.Errorf("failed to delete peer %s: %w", id, err)
 	}

-	peers, err := m.db.GetInterfacePeers(ctx, iface.Identifier)
-	if err != nil {
-		return fmt.Errorf("failed to load peers for interface %s: %w", iface.Identifier, err)
-	}
-
 	m.bus.Publish(app.TopicPeerDeleted, *peer)
 	// Update routes after peers have changed
-	m.bus.Publish(app.TopicRouteUpdate, domain.RoutingTableInfo{
-		Interface:  *iface,
-		AllowedIps: iface.GetAllowedIPs(peers),
-		FwMark:     iface.FirewallMark,
-		Table:      iface.GetRoutingTable(),
-	})
+	m.bus.Publish(app.TopicRouteUpdate, "peers updated")
 	// Update interface after peers have changed
 	m.bus.Publish(app.TopicPeerInterfaceUpdated, peer.InterfaceIdentifier)

@@ -448,28 +438,20 @@ func (m Manager) GetUserPeerStats(ctx context.Context, id domain.UserIdentifier)
 // region helper-functions

 func (m Manager) savePeers(ctx context.Context, peers ...*domain.Peer) error {
-	interfaces := make(map[domain.InterfaceIdentifier]domain.Interface)
-	interfacePeers := make(map[domain.InterfaceIdentifier][]domain.Peer)
+	interfaces := make(map[domain.InterfaceIdentifier]struct{})

 	for _, peer := range peers {
-		// get interface from db if it is not yet in the map
-		if _, ok := interfaces[peer.InterfaceIdentifier]; !ok {
-			iface, err := m.db.GetInterface(ctx, peer.InterfaceIdentifier)
-			if err != nil {
-				return fmt.Errorf("unable to find interface %s: %w", peer.InterfaceIdentifier, err)
-			}
-			interfaces[peer.InterfaceIdentifier] = *iface
+		iface, err := m.db.GetInterface(ctx, peer.InterfaceIdentifier)
+		if err != nil {
+			return fmt.Errorf("unable to find interface %s: %w", peer.InterfaceIdentifier, err)
 		}

-		iface := interfaces[peer.InterfaceIdentifier]
-		interfacePeers[iface.Identifier] = append(interfacePeers[iface.Identifier], *peer)
-
 		// Always save the peer to the backend, regardless of disabled/expired state
 		// The backend will handle the disabled state appropriately
-		err := m.db.SavePeer(ctx, peer.Identifier, func(p *domain.Peer) (*domain.Peer, error) {
+		err = m.db.SavePeer(ctx, peer.Identifier, func(p *domain.Peer) (*domain.Peer, error) {
 			peer.CopyCalculatedAttributes(p)

-			err := m.wg.GetController(iface).SavePeer(ctx, peer.InterfaceIdentifier, peer.Identifier,
+			err := m.wg.GetController(*iface).SavePeer(ctx, peer.InterfaceIdentifier, peer.Identifier,
 				func(pp *domain.PhysicalPeer) (*domain.PhysicalPeer, error) {
 					domain.MergeToPhysicalPeer(pp, peer)
 					return pp, nil
@@ -493,16 +475,13 @@ func (m Manager) savePeers(ctx context.Context, peers ...*domain.Peer) error {
 				Peer:   *peer,
 			},
 		})
+
+		interfaces[peer.InterfaceIdentifier] = struct{}{}
 	}

 	// Update routes after peers have changed
-	for id, iface := range interfaces {
-		m.bus.Publish(app.TopicRouteUpdate, domain.RoutingTableInfo{
-			Interface:  iface,
-			AllowedIps: iface.GetAllowedIPs(interfacePeers[id]),
-			FwMark:     iface.FirewallMark,
-			Table:      iface.GetRoutingTable(),
-		})
+	if len(interfaces) != 0 {
+		m.bus.Publish(app.TopicRouteUpdate, "peers updated")
 	}

 	for iface := range interfaces {
--- a/internal/config/backend.go
+++ b/internal/config/backend.go
@@ -13,7 +13,6 @@ type Backend struct {
 	// Local Backend-specific configuration

 	IgnoredLocalInterfaces []string `yaml:"ignored_local_interfaces"` // A list of interface names that should be ignored by this backend (e.g., "wg0")
-	LocalResolvconfPrefix  string   `yaml:"local_resolvconf_prefix"`  // The prefix to use for interface names when passing them to resolvconf.

 	// External Backend-specific configuration

--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -134,9 +134,6 @@ func defaultConfig() *Config {

 	cfg.Backend = Backend{
 		Default: LocalBackendName, // local backend is the default (using wgcrtl)
-		// Most resolconf implementations use "tun." as a prefix for interface names.
-		// But systemd's implementation uses no prefix, for example.
-		LocalResolvconfPrefix: "tun.",
 	}

 	cfg.Web = WebConfig{
--- a/internal/domain/interface.go
+++ b/internal/domain/interface.go
@@ -308,14 +308,12 @@ func MergeToPhysicalInterface(pi *PhysicalInterface, i *Interface) {
 }

 type RoutingTableInfo struct {
-	Interface  Interface
-	AllowedIps []Cidr
-	FwMark     uint32
-	Table      int
+	FwMark uint32
+	Table  int
 }

 func (r RoutingTableInfo) String() string {
-	return fmt.Sprintf("%s: %d -> %d", r.Interface.Identifier, r.FwMark, r.Table)
+	return fmt.Sprintf("%d -> %d", r.FwMark, r.Table)
 }

 func (r RoutingTableInfo) ManagementEnabled() bool {
--- a/internal/domain/interface_controller.go
+++ b/internal/domain/interface_controller.go
@@ -1,27 +0,0 @@
-package domain
-
-import "context"
-
-type InterfaceController interface {
-	GetId() InterfaceBackend
-	GetInterfaces(_ context.Context) ([]PhysicalInterface, error)
-	GetInterface(_ context.Context, id InterfaceIdentifier) (*PhysicalInterface, error)
-	GetPeers(_ context.Context, deviceId InterfaceIdentifier) ([]PhysicalPeer, error)
-	SaveInterface(
-		_ context.Context,
-		id InterfaceIdentifier,
-		updateFunc func(pi *PhysicalInterface) (*PhysicalInterface, error),
-	) error
-	DeleteInterface(_ context.Context, id InterfaceIdentifier) error
-	SavePeer(
-		_ context.Context,
-		deviceId InterfaceIdentifier,
-		id PeerIdentifier,
-		updateFunc func(pp *PhysicalPeer) (*PhysicalPeer, error),
-	) error
-	DeletePeer(_ context.Context, deviceId InterfaceIdentifier, id PeerIdentifier) error
-	PingAddresses(
-		ctx context.Context,
-		addr string,
-	) (*PingerResult, error)
-}
--- a/internal/domain/ip.go
+++ b/internal/domain/ip.go
@@ -199,22 +199,3 @@ func (c Cidr) Contains(other Cidr) bool {

 	return subnet.Contains(otherIP)
 }
-
-// ContainsDefaultRoute returns true if the given CIDRs contain a default route.
-func ContainsDefaultRoute(cidrs []Cidr) (ipV4, ipV6 bool) {
-	for _, allowedIP := range cidrs {
-		if ipV4 && ipV6 {
-			break // speed up
-		}
-
-		if allowedIP.Prefix().Bits() == 0 {
-			if allowedIP.IsV4() {
-				ipV4 = true
-			} else {
-				ipV6 = true
-			}
-		}
-	}
-
-	return
-}
--- a/internal/domain/peer.go
+++ b/internal/domain/peer.go
@@ -308,33 +308,22 @@ func ConvertPhysicalPeer(pp *PhysicalPeer) *Peer {

 func MergeToPhysicalPeer(pp *PhysicalPeer, p *Peer) {
 	pp.Identifier = p.Identifier
-	pp.PresharedKey = p.PresharedKey
-	pp.PublicKey = p.Interface.PublicKey
-
-	switch p.Interface.Type {
-	case InterfaceTypeClient: // this means that the corresponding interface in wgportal is a server interface
-		allowedIPs := make([]Cidr, len(p.Interface.Addresses))
-		for i, ip := range p.Interface.Addresses {
-			allowedIPs[i] = ip.HostAddr() // add the peer's host address to the allowed IPs
-		}
-		extraAllowedIPs, _ := CidrsFromString(p.ExtraAllowedIPsStr)
-		pp.AllowedIPs = append(allowedIPs, extraAllowedIPs...)
-	case InterfaceTypeServer: // this means that the corresponding interface in wgportal is a client interface
+	pp.Endpoint = p.Endpoint.GetValue()
+	if p.Interface.Type == InterfaceTypeServer {
 		allowedIPs, _ := CidrsFromString(p.AllowedIPsStr.GetValue())
 		extraAllowedIPs, _ := CidrsFromString(p.ExtraAllowedIPsStr)
 		pp.AllowedIPs = append(allowedIPs, extraAllowedIPs...)
-		pp.Endpoint = p.Endpoint.GetValue()
-		pp.PersistentKeepalive = p.PersistentKeepalive.GetValue()
-	case InterfaceTypeAny: // this means that the corresponding interface in wgportal has no specific type
+	} else {
 		allowedIPs := make([]Cidr, len(p.Interface.Addresses))
 		for i, ip := range p.Interface.Addresses {
-			allowedIPs[i] = ip.HostAddr() // add the peer's host address to the allowed IPs
+			allowedIPs[i] = ip.HostAddr()
 		}
 		extraAllowedIPs, _ := CidrsFromString(p.ExtraAllowedIPsStr)
 		pp.AllowedIPs = append(allowedIPs, extraAllowedIPs...)
-		pp.Endpoint = p.Endpoint.GetValue()
-		pp.PersistentKeepalive = p.PersistentKeepalive.GetValue()
 	}
+	pp.PresharedKey = p.PresharedKey
+	pp.PublicKey = p.Interface.PublicKey
+	pp.PersistentKeepalive = p.PersistentKeepalive.GetValue()

 	switch pp.ImportSource {
 	case ControllerTypeMikrotik:
--- a/internal/lowlevel/mikrotik.go
+++ b/internal/lowlevel/mikrotik.go
@@ -267,7 +267,6 @@ func parseHttpResponse[T any](resp *http.Response, err error) MikrotikApiRespons
 	}

 	defer func(Body io.ReadCloser) {
-		_, _ = io.Copy(io.Discard, Body) // ensure to empty the body
 		err := Body.Close()
 		if err != nil {
 			slog.Error("failed to close response body", "error", err)
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -6,12 +6,8 @@ repo_name: h44z/wg-portal
 repo_url: https://github.com/h44z/wg-portal
 copyright: Copyright &copy; 2023-2025 WireGuard Portal Project

-extra_javascript:
-  - javascript/img-comparison-slider.js
-
 extra_css:
  - stylesheets/extra.css
-  - stylesheets/img-comparison-slider.css

 theme:
  name: material