diff --git a/roles/configuration/tasks/network.yml b/roles/configuration/tasks/network.yml
index 6a4cc2a..b53b8f5 100644
--- a/roles/configuration/tasks/network.yml
+++ b/roles/configuration/tasks/network.yml
@@ -29,5 +29,10 @@
       - configuration_detected_interfaces | length > 0
     fail_msg: Failed to detect any network interfaces.
 
+- name: Set DNS configuration facts
+  ansible.builtin.set_fact:
+    configuration_dns_list: "{{ system_cfg.network.dns.servers }}"
+    configuration_dns_search: "{{ system_cfg.network.dns.search }}"
+
 - name: Configure networking
   ansible.builtin.include_tasks: "{{ configuration_network_task_map[os] | default('network_nm.yml') }}"
diff --git a/roles/configuration/tasks/network_alpine.yml b/roles/configuration/tasks/network_alpine.yml
index 1850179..e10ca24 100644
--- a/roles/configuration/tasks/network_alpine.yml
+++ b/roles/configuration/tasks/network_alpine.yml
@@ -1,7 +1,5 @@
 ---
 - name: Write Alpine network interfaces
-  vars:
-    configuration_dns_list: "{{ system_cfg.network.dns.servers | default([]) }}"
   ansible.builtin.copy:
     dest: /mnt/etc/network/interfaces
     mode: "0644"
@@ -25,9 +23,6 @@
       {% endfor %}
 
 - name: Set Alpine DNS resolvers
-  vars:
-    configuration_dns_list: "{{ system_cfg.network.dns.servers | default([]) }}"
-    configuration_dns_search: "{{ system_cfg.network.dns.search | default([]) }}"
   when: configuration_dns_list | length > 0 or configuration_dns_search | length > 0
   ansible.builtin.copy:
     dest: /mnt/etc/resolv.conf
diff --git a/roles/configuration/tasks/network_void.yml b/roles/configuration/tasks/network_void.yml
index ed1e9f3..bbdc803 100644
--- a/roles/configuration/tasks/network_void.yml
+++ b/roles/configuration/tasks/network_void.yml
@@ -1,8 +1,5 @@
 ---
 - name: Write dhcpcd configuration
-  vars:
-    configuration_dns_list: "{{ system_cfg.network.dns.servers | default([]) }}"
-    configuration_dns_search: "{{ system_cfg.network.dns.search | default([]) }}"
   ansible.builtin.copy:
     dest: /mnt/etc/dhcpcd.conf
     mode: "0644"
diff --git a/roles/configuration/templates/network.j2 b/roles/configuration/templates/network.j2
index cbbd066..8b2ffb3 100644
--- a/roles/configuration/templates/network.j2
+++ b/roles/configuration/templates/network.j2
@@ -9,8 +9,8 @@ interface-name={{ configuration_iface_name }}
 
 [ipv4]
 {% set iface = configuration_iface %}
-{% set dns_list = system_cfg.network.dns.servers | default([]) %}
-{% set search_list = system_cfg.network.dns.search | default([]) %}
+{% set dns_list = configuration_dns_list %}
+{% set search_list = configuration_dns_search %}
 {% if iface.ip | default('') | string | length %}
 address1={{ iface.ip }}/{{ iface.prefix }}{{ (',' ~ iface.gateway) if (iface.gateway | default('') | string | length) else '' }}
 method=manual