diff --git a/install-systemd-resolved/cleanup.d/30-cleanup-resolved-mimic b/install-systemd-resolved/cleanup.d/30-cleanup-resolved-mimic
new file mode 100755
index 0000000..5fb365b
--- /dev/null
+++ b/install-systemd-resolved/cleanup.d/30-cleanup-resolved-mimic
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rm ${TARGET_ROOT}/run/systemd/resolve/stub-resolv.conf
+rmdir ${TARGET_ROOT}/run/systemd/resolve/
diff --git a/install-systemd-resolved/pre-install.d/05-preserve-nameservers b/install-systemd-resolved/pre-install.d/05-preserve-nameservers
new file mode 100755
index 0000000..3d1e724
--- /dev/null
+++ b/install-systemd-resolved/pre-install.d/05-preserve-nameservers
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+mkdir -p /run/systemd/resolve
+echo "Saving /etc/resolve.conf to mimic systemd-resolved until in chroot"
+cat /etc/resolv.conf > /run/systemd/resolve/stub-resolv.conf