diff --git a/archiso/airootfs/etc/sysctl.d/99-local.conf b/archiso/airootfs/etc/sysctl.d/99-local.conf
new file mode 100644
index 0000000..b154692
--- /dev/null
+++ b/archiso/airootfs/etc/sysctl.d/99-local.conf
@@ -0,0 +1 @@
+net.ipv6.conf.default.use_tempaddr = 2
diff --git a/archiso/airootfs/etc/systemd/network/20-ethernet.network b/archiso/airootfs/etc/systemd/network/20-ethernet.network
deleted file mode 100644
index 9ada778..0000000
--- a/archiso/airootfs/etc/systemd/network/20-ethernet.network
+++ /dev/null
@@ -1,21 +0,0 @@
-[Match]
-# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*).
-# See https://bugs.archlinux.org/task/70892
-# Instead match by globbing the network interface name.
-Name=en*
-Name=eth*
-
-[Network]
-DHCP=yes
-IPv6PrivacyExtensions=yes
-
-# systemd-networkd does not set per-interface-type default route metrics
-# https://github.com/systemd/systemd/issues/17698
-# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband.
-# Use values from NetworkManager. From nm_device_get_route_metric_default in
-# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c
-[DHCPv4]
-RouteMetric=100
-
-[IPv6AcceptRA]
-RouteMetric=100
diff --git a/archiso/airootfs/etc/systemd/network/20-wlan.network b/archiso/airootfs/etc/systemd/network/20-wlan.network
deleted file mode 100644
index 601d5b8..0000000
--- a/archiso/airootfs/etc/systemd/network/20-wlan.network
+++ /dev/null
@@ -1,17 +0,0 @@
-[Match]
-Name=wl*
-
-[Network]
-DHCP=yes
-IPv6PrivacyExtensions=yes
-
-# systemd-networkd does not set per-interface-type default route metrics
-# https://github.com/systemd/systemd/issues/17698
-# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband.
-# Use values from NetworkManager. From nm_device_get_route_metric_default in
-# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c
-[DHCPv4]
-RouteMetric=600
-
-[IPv6AcceptRA]
-RouteMetric=600
diff --git a/archiso/airootfs/etc/systemd/network/20-wwan.network b/archiso/airootfs/etc/systemd/network/20-wwan.network
deleted file mode 100644
index 9104c24..0000000
--- a/archiso/airootfs/etc/systemd/network/20-wwan.network
+++ /dev/null
@@ -1,17 +0,0 @@
-[Match]
-Name=ww*
-
-[Network]
-DHCP=yes
-IPv6PrivacyExtensions=yes
-
-# systemd-networkd does not set per-interface-type default route metrics
-# https://github.com/systemd/systemd/issues/17698
-# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband.
-# Use values from NetworkManager. From nm_device_get_route_metric_default in
-# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c
-[DHCPv4]
-RouteMetric=700
-
-[IPv6AcceptRA]
-RouteMetric=700
diff --git a/archiso/airootfs/etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service b/archiso/airootfs/etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service
new file mode 120000
index 0000000..1aff68e
--- /dev/null
+++ b/archiso/airootfs/etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/wpa_supplicant.service
\ No newline at end of file
diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service
deleted file mode 120000
index 3625abd..0000000
--- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/iwd.service
\ No newline at end of file
diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service
new file mode 120000
index 0000000..1aff68e
--- /dev/null
+++ b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/wpa_supplicant.service
\ No newline at end of file
diff --git a/archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service
deleted file mode 120000
index 7d6ad92..0000000
--- a/archiso/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/systemd-networkd-wait-online.service
\ No newline at end of file
diff --git a/archiso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/archiso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf
deleted file mode 100644
index c9f9bce..0000000
--- a/archiso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Allow systemd-networkd-wait-online to succeed with one interface, otherwise, if multiple network interfaces exist,
-# network-online.target gets needlessly delayed.
-# See https://wiki.archlinux.org/title/systemd-networkd#systemd-networkd-wait-online
-[Service]
-ExecStart=
-ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any