diff --git a/roles/sysctl/tasks/main.yml b/roles/sysctl/tasks/main.yml
index 3563613..60a17d6 100644
--- a/roles/sysctl/tasks/main.yml
+++ b/roles/sysctl/tasks/main.yml
@@ -10,7 +10,31 @@
     dest: /etc/modules-load.d/bbr.conf
     mode: "0644"
 
-- name: Sysctl Parameter setzen
+- name: Legacy-Sysctl-Dateien pruefen
+  ansible.builtin.stat:
+    path: "{{ item }}"
+  loop:
+    - /etc/sysctl.conf
+    - /etc/sysctl.d/99-streaming.conf
+  register: legacy_sysctl_files
+
+- name: Verwaltete Werte aus Legacy sysctl.conf entfernen
+  ansible.builtin.lineinfile:
+    path: /etc/sysctl.conf
+    regexp: "^[ \\t]*{{ item.key | regex_escape }}[ \\t]*="
+    state: absent
+  loop: "{{ sysctl_params }}"
+  when: legacy_sysctl_files.results[0].stat.exists
+
+- name: Verwaltete Werte aus Legacy 99-streaming.conf entfernen
+  ansible.builtin.lineinfile:
+    path: /etc/sysctl.d/99-streaming.conf
+    regexp: "^[ \\t]*{{ item.key | regex_escape }}[ \\t]*="
+    state: absent
+  loop: "{{ sysctl_params }}"
+  when: legacy_sysctl_files.results[1].stat.exists
+
+- name: Sysctl Parameter kanonisch setzen
   ansible.posix.sysctl:
     name: "{{ item.key }}"
     value: "{{ item.value }}"