diff --git a/ansible/tasks/fix-ipv6-ndisc.yml b/ansible/tasks/fix-ipv6-ndisc.yml
index 8953fd880..1ea01bfb4 100644
--- a/ansible/tasks/fix-ipv6-ndisc.yml
+++ b/ansible/tasks/fix-ipv6-ndisc.yml
@@ -1,33 +1,30 @@
 ---
-- name: fix Network - systemd timer file
-  copy:
-    dest: /etc/systemd/system/systemd-networkd-check-and-fix.timer
-    src: "files/systemd-networkd/systemd-networkd-check-and-fix.timer"
-    owner: root
-    group: root
-    mode: 0644
-
-- name: fix Network - systemd service file
-  copy:
-    dest: /etc/systemd/system/systemd-networkd-check-and-fix.service
-    src: "files/systemd-networkd/systemd-networkd-check-and-fix.service"
-    owner: root
-    group: root
-    mode: 0644
+- name: fix Network - systemd timer and service file
+  ansible.builtin.copy:
+    dest: "/etc/systemd/system/systemd-networkd-check-and-fix.{{ network_item }}"
+    group: 'root'
+    mode: '0644'
+    owner: 'root'
+    src: "files/systemd-networkd/systemd-networkd-check-and-fix.{{ network_item }}"
+  loop:
+    - service
+    - timer
+  loop_control:
+    loop_var: 'network_item'
 
 - name: fix Network - detect script
-  copy:
-    dest: /usr/local/bin/systemd-networkd-check-and-fix.sh
-    src: "files/systemd-networkd/systemd-networkd-check-and-fix.sh"
-    owner: root
-    group: root
-    mode: 0700
+  ansible.builtin.copy:
+    dest: '/usr/local/bin/systemd-networkd-check-and-fix.sh'
+    src: 'files/systemd-networkd/systemd-networkd-check-and-fix.sh'
+    owner: 'root'
+    group: 'root'
+    mode: '0700'
 
 - name: fix Network - reload systemd
-  systemd:
+  ansible.builtin.systemd_service:
     daemon_reload: false
 
 - name: fix Network - ensure systemd timer is installed but disabled
-  systemd:
-    name: systemd-networkd-check-and-fix.timer
+  ansible.builtin.systemd_service:
+    name: 'systemd-networkd-check-and-fix.timer'
     enabled: false