diff --git a/host_vars/samba-ad-dc1.yml b/host_vars/samba-ad-dc1.yml
new file mode 120000
index 0000000..724aeda
--- /dev/null
+++ b/host_vars/samba-ad-dc1.yml
@@ -0,0 +1 @@
+samba-ad-dc1.universe.local.yml
\ No newline at end of file
diff --git a/host_vars/samba-ad-dc2.yml b/host_vars/samba-ad-dc2.yml
new file mode 120000
index 0000000..9d625fd
--- /dev/null
+++ b/host_vars/samba-ad-dc2.yml
@@ -0,0 +1 @@
+samba-ad-dc2.universe.local.yml
\ No newline at end of file
diff --git a/hosts b/hosts
index 8a22676..c6c1d68 100644
--- a/hosts
+++ b/hosts
@@ -29,6 +29,8 @@ pixelfed.universe.local
 samba.universe.local
 samba-ad-dc1.universe.local
 samba-ad-dc2.universe.local
+samba-ad-dc1
+samba-ad-dc2
 shinobi.universe.local
 step-ca.universe.local
 truenas.universe.local
diff --git a/roles/backup/vars/main.yml b/roles/backup/vars/main.yml
index 7704f0b..5dcd633 100644
--- a/roles/backup/vars/main.yml
+++ b/roles/backup/vars/main.yml
@@ -1,43 +1,55 @@
 hosts_to_backup:
-  - { hostname: "AdGuard", fqdn: "AdGuard.universe.local." }
-  - { hostname: "agh01", fqdn: "agh01.universe.local." }
-  - { hostname: "dhcp-kea", fqdn: "dhcp-kea.universe.local." }
-  - { hostname: "dhcp-stork", fqdn: "dhcp-stork.universe.local." }
-  - { hostname: "dnspri", fqdn: "dnspri.universe.local." }
-  - { hostname: "docker01", fqdn: "docker01.universe.local." }
-  - { hostname: "docker02", fqdn: "docker02.universe.local." }
-  - { hostname: "freeradius", fqdn: "freeradius.universe.local." }
-  - { hostname: "grafana", fqdn: "grafana.universe.local." }
-  - { hostname: "graylog", fqdn: "graylog.universe.local." }
-  - { hostname: "haproxy01", fqdn: "haproxy01.universe.local." }
-  - { hostname: "haproxy02", fqdn: "haproxy02.universe.local." }
-  - { hostname: "icinga", fqdn: "icinga.universe.local." }
-  - { hostname: "jitsimeet", fqdn: "jitsimeet.universe.local." }
-  - { hostname: "librenms", fqdn: "librenms.universe.local." }
-  - { hostname: "mail", fqdn: "mail.universe.local." }
-  - { hostname: "mailcow", fqdn: "mailcow.universe.local." }
-  - { hostname: "mariadb01", fqdn: "mariadb01.universe.local." }
   - { hostname: "mariadb02", fqdn: "mariadb02.universe.local." }
-  - { hostname: "mariadb03", fqdn: "mariadb03.universe.local." }
-  - { hostname: "mastodon", fqdn: "mastodon.universe.local." }
-  - { hostname: "netbox", fqdn: "netbox.universe.local." }
-  - { hostname: "nextcloud", fqdn: "nextcloud.universe.local." }
-  - { hostname: "ns1", fqdn: "ns1.universe.local." }
-  - { hostname: "ntfy", fqdn: "ntfy.universe.local." }
+  - { hostname: "haproxy02", fqdn: "haproxy02.universe.local." }
+  - { hostname: "mail", fqdn: "mail.universe.local." }
   - { hostname: "omada", fqdn: "omada.universe.local." }
-  - { hostname: "omada-stdby", fqdn: "omada-stdby.universe.local." }
-  - { hostname: "pi-alert", fqdn: "pi-alert.universe.local." }
-  - { hostname: "pi-alert-lan", fqdn: "pi-alert-lan.universe.local." }
-  - { hostname: "pixelfed", fqdn: "pixelfed.universe.local." }
-  - { hostname: "podman01", fqdn: "podman01.universe.local." }
-  - { hostname: "pve", fqdn: "pve.universe.local." }
-  - { hostname: "pve2", fqdn: "pve2.universe.local." }
-  - { hostname: "pve3", fqdn: "pve3.universe.local." }
-  - { hostname: "samba-ad-dc1", fqdn: "samba-ad-dc1.universe.local." }
-  - { hostname: "samba-ad-dc2", fqdn: "samba-ad-dc2.universe.local." }
-  - { hostname: "searx", fqdn: "searx.universe.local." }
-  - { hostname: "shinobi", fqdn: "shinobi.universe.local." }
   - { hostname: "step-ca", fqdn: "step-ca.universe.local." }
+  - { hostname: "ntfy", fqdn: "ntfy.universe.local." }
+  - { hostname: "searx", fqdn: "searx.universe.local." }
+  - { hostname: "dnspri", fqdn: "dnspri.universe.local." }
+  - { hostname: "gs1900-8hp", fqdn: "gs1900-8hp.universe.local." }
+  - { hostname: "pve4", fqdn: "pve4.universe.local." }
+  - { hostname: "pve3", fqdn: "pve3.universe.local." }
+  - { hostname: "librenms", fqdn: "librenms.universe.local." }
+  - { hostname: "webserver", fqdn: "webserver.universe.local." }
+  - { hostname: "agh01", fqdn: "agh01.universe.local." }
+  - { hostname: "mastodon", fqdn: "mastodon.universe.local." }
+  - { hostname: "icinga", fqdn: "icinga.universe.local." }
+  - { hostname: "haproxy01", fqdn: "haproxy01.universe.local." }
+  - { hostname: "freeradius", fqdn: "freeradius.universe.local." }
+  - { hostname: "dhcp-kea", fqdn: "dhcp-kea.universe.local." }
+  - { hostname: "pi-alert-lan", fqdn: "pi-alert-lan.universe.local." }
+  - { hostname: "mariadb01", fqdn: "mariadb01.universe.local." }
+  - { hostname: "dhcp-stork", fqdn: "dhcp-stork.universe.local." }
+  - { hostname: "paperless", fqdn: "paperless.universe.local." }
+  - { hostname: "truenas", fqdn: "truenas.universe.local." }
+  - { hostname: "grafana", fqdn: "grafana.universe.local." }
+  - { hostname: "idrac-dell", fqdn: "idrac-dell.universe.local." }
+  - { hostname: "docker01", fqdn: "docker01.universe.local." }
+  - { hostname: "pi-alert", fqdn: "pi-alert.universe.local." }
+  - { hostname: "tatooine", fqdn: "tatooine.universe.local." }
+  - { hostname: "pixelfed", fqdn: "pixelfed.universe.local." }
+  - { hostname: "pve2", fqdn: "pve2.universe.local." }
+  - { hostname: "pve", fqdn: "pve.universe.local." }
+  - { hostname: "jitsimeet", fqdn: "jitsimeet.universe.local." }
+  - { hostname: "haproxy", fqdn: "haproxy.universe.local." }
+  - { hostname: "ns2", fqdn: "ns2.universe.local." }
+  - { hostname: "homeassistant", fqdn: "homeassistant.universe.local." }
+  - { hostname: "ns1", fqdn: "ns1.universe.local." }
+  - { hostname: "endorvm", fqdn: "endorvm.universe.local." }
+  - { hostname: "backup", fqdn: "backup.universe.local." }
+  - { hostname: "gitea-runner", fqdn: "gitea-runner.universe.local." }
   - { hostname: "tinyproxy", fqdn: "tinyproxy.universe.local." }
-  - { hostname: "wazuh", fqdn: "wazuh.universe.local." }
-  - { hostname: "webserver", fqdn: "webserver.universe.local." }
\ No newline at end of file
+  - { hostname: "tatooine2", fqdn: "tatooine2.universe.local." }
+  - { hostname: "mailcow", fqdn: "mailcow.universe.local." }
+  - { hostname: "netbox", fqdn: "netbox.universe.local." }
+  - { hostname: "AdGuard", fqdn: "adguard.universe.local." }
+  - { hostname: "samba-ad-dc2", fqdn: "samba-ad-dc2.universe.local." }
+  - { hostname: "graylog", fqdn: "graylog.universe.local." }
+  - { hostname: "shinobi", fqdn: "shinobi.universe.local." }
+  - { hostname: "nextcloud", fqdn: "nextcloud.universe.local." }
+  - { hostname: "podman01", fqdn: "podman01.universe.local." }
+  - { hostname: "docker02", fqdn: "docker02.universe.local." }
+  - { hostname: "samba-ad-dc1", fqdn: "samba-ad-dc1.universe.local." }
+  - { hostname: "moode", fqdn: "moode.universe.local." }
+  - { hostname: "diskstation", fqdn: "diskstation.universe.local." }
diff --git a/roles/omada-controller/defaults/main.yml b/roles/omada-controller/defaults/main.yml
index 6da15eb..d5adfa3 100644
--- a/roles/omada-controller/defaults/main.yml
+++ b/roles/omada-controller/defaults/main.yml
@@ -19,4 +19,4 @@ omada_controller_mongodb_repo_release: "buster"
 
 # Die Version des MongoDB-Servers, die installiert werden soll.
 # Der Omada Controller benötigt eine Version < 4.5.0. MongoDB 4.4 ist eine kompatible Wahl.
-omada_controller_mongodb_version: "4.4"
+omada_controller_mongodb_version: "7.0"
diff --git a/roles/omada-controller/tasks/main.yml b/roles/omada-controller/tasks/main.yml
index 9358537..ab16ee2 100644
--- a/roles/omada-controller/tasks/main.yml
+++ b/roles/omada-controller/tasks/main.yml
@@ -1,4 +1,4 @@
-#SPDX-License-Identifier: MIT-0
+# SPDX-License-Identifier: MIT-0
 ---
 # tasks file for roles/omada-controller
 # roles/omada-controller/tasks/main.yml
@@ -13,7 +13,7 @@
       - curl
       - apt-transport-https
     state: present
-    update_cache: yes
+    update_cache: true
   register: apt_install
   retries: 3
   until: apt_install is success
@@ -35,7 +35,7 @@
     repo: "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg ] https://repo.mongodb.org/apt/debian {{ omada_controller_mongodb_repo_release }}/mongodb-org/{{ omada_controller_mongodb_version }} main"
     state: present
     filename: "mongodb-org-{{ omada_controller_mongodb_version }}"
-    update_cache: yes
+    update_cache: true
   # Der 'signed-by'-Parameter verweist auf den zuvor dearmored Schlüssel.
 
 - name: Install MongoDB server
@@ -68,4 +68,4 @@
   ansible.builtin.service:
     name: tpeap
     state: started
-    enabled: yes
+    enabled: true
diff --git a/roles/server/files/telegraf.d/agent.conf.old b/roles/server/files/telegraf.d/agent.conf.old
new file mode 100644
index 0000000..5dde452
--- /dev/null
+++ b/roles/server/files/telegraf.d/agent.conf.old
@@ -0,0 +1,20 @@
+###############################################################################
+# GLOBAL AGENT CONFIG
+###############################################################################
+[agent]
+  ## Erfassungsintervall
+  interval = "10s"
+
+  ## Batches kleiner halten → weniger RAM pro Batch
+  metric_batch_size = 500
+  metric_buffer_limit = 10000    # Maximal 10.000 Messpunkte im RAM
+
+  ## Wenn der Buffer voll ist, werden alte Daten verworfen
+  ## → verhindert "Memory blowup"
+  collection_jitter = "1s"
+  flush_interval = "10s"
+  flush_jitter = "2s"
+
+  ## Jeder Output-Write versucht nur kurz, dann wird das Batch verworfen
+  ## → wichtig gegen RAM-Voll-Laufen
+  round_interval = true
\ No newline at end of file
diff --git a/roles/webservers/tasks/main.yml b/roles/webservers/tasks/main.yml
index da8d835..66e24bf 100644
--- a/roles/webservers/tasks/main.yml
+++ b/roles/webservers/tasks/main.yml
@@ -1,5 +1,5 @@
 # Load distro-specific variables
-- include_vars: "{{ ansible_facts['distribution'] | lower }}.yml"
+- ansible.builtin.include_vars: "{{ ansible_facts['distribution'] | lower }}.yml"
   tags: always
 
 - block:
@@ -9,14 +9,14 @@
   - import_tasks: install_apache.yml
     when:
       - apache is defined
-      - apache == true
+      - apache
   - import_tasks: install_nginx.yml
     when:
       - nginx is defined
-      - nginx == true
+      - nginx
   - import_tasks: install_php.yml
   - name: webservers | certbot | install certbot
-    package:
+    ansible.builtin.package:
       name: certbot
       state: latest
   - include_tasks: apps/apps.yml
\ No newline at end of file