diff --git a/tasks/apt/sources.yaml b/tasks/apt/sources.yaml
index 715717c..fde952b 100644
--- a/tasks/apt/sources.yaml
+++ b/tasks/apt/sources.yaml
@@ -5,50 +5,42 @@
   tags: "apt"
   block:
 
-    # configure apt sources
-    - name: "apt - config - configure apt sources"
-      ansible.builtin.template:
-        src: "templates/apt/sources.d/sources.list.{{ ansible_distribution }}.j2"
-        dest: "/etc/apt/sources.list"
-        owner: "root"
-        group: "root"
-        mode: "0644"
-      notify: "apt force cache update"
-      when:
-        - 'ansible_os_family == "Debian"'
-        - 'ansible_distribution_major_version <= "23"'
+    # configure legacy apt sources
+    - name: "configure legacy apt sources"
+      when: >
+        (ansible_distribution == "Debian" and ansible_distribution_major_version | int <= 12) or
+        (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int <= 23)
+      block:
 
-    # configure apt sources - proxmox list
-    - name: "apt - config - configure apt sources - proxmox list"
-      ansible.builtin.template:
-        src: "templates/apt/sources.d/proxmox.list.j2"
-        dest: "/etc/apt/sources.list.d/proxmox.list"
-        owner: "root"
-        group: "root"
-        mode: "0644"
-      notify: "apt force cache update"
-      when:
-        - 'ansible_os_family == "Debian"'
-        - "inventory_hostname in groups['proxmox']"
+        # configure apt sources
+        - name: "apt - config - configure apt sources"
+          ansible.builtin.template:
+            src: "templates/apt/sources.d/{{ ansible_distribution | lower }}.sources.list.j2"
+            dest: "/etc/apt/sources.list"
+            owner: "root"
+            group: "root"
+            mode: "0644"
+          notify: "apt force cache update"
 
-    # configure apt sources
-    - name: "apt - config - configure apt sources"
-      ansible.builtin.template:
-        src: "templates/apt/sources.d/{{ ansible_distribution }}.sources.j2"
-        dest: "/etc/apt/sources.list.d/ubuntu.sources"
-        owner: "root"
-        group: "root"
-        mode: "0644"
-      notify: "apt force cache update"
-      when:
-        - 'ansible_distribution == "Ubuntu"'
-        - 'ansible_distribution_major_version >= "24"'
+    # configure deb822 apt sources
+    - name: "configure deb822 apt sources"
+      when: >
+        (ansible_distribution == "Debian" and ansible_distribution_major_version | int >= 13) or
+        (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 24)
+      block:
 
-    # delete unused sources.list
-    - name: "apt - config - remove old sources.list"
-      ansible.builtin.file:
-        path: "/etc/apt/sources.list"
-        state: "absent"
-      when:
-        - 'ansible_distribution == "Ubuntu"'
-        - 'ansible_distribution_major_version >= "24"'
+        # configure apt sources
+        - name: "apt - config - configure apt sources"
+          ansible.builtin.template:
+            src: "templates/apt/sources.d/{{ ansible_distribution | lower }}.sources.j2"
+            dest: "/etc/apt/sources.list.d/{{ ansible_distribution | lower }}.sources"
+            owner: "root"
+            group: "root"
+            mode: "0644"
+          notify: "apt force cache update"
+
+        # delete unused sources.list
+        - name: "apt - config - remove old sources.list"
+          ansible.builtin.file:
+            path: "/etc/apt/sources.list"
+            state: "absent"
diff --git a/templates/apt/sources.d/sources.list.Debian.j2 b/templates/apt/sources.d/debian.sources.list.j2
similarity index 100%
rename from templates/apt/sources.d/sources.list.Debian.j2
rename to templates/apt/sources.d/debian.sources.list.j2
diff --git a/templates/apt/sources.d/Ubuntu.sources.j2 b/templates/apt/sources.d/ubuntu.sources.j2
similarity index 100%
rename from templates/apt/sources.d/Ubuntu.sources.j2
rename to templates/apt/sources.d/ubuntu.sources.j2
diff --git a/templates/apt/sources.d/sources.list.Ubuntu.j2 b/templates/apt/sources.d/ubuntu.sources.list.j2
similarity index 100%
rename from templates/apt/sources.d/sources.list.Ubuntu.j2
rename to templates/apt/sources.d/ubuntu.sources.list.j2