diff --git a/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-resolvconf.path b/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-resolvconf.path
new file mode 100644
index 0000000..8a68036
--- /dev/null
+++ b/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-resolvconf.path
@@ -0,0 +1,9 @@
+[Unit]
+Description=Watch /run/NetworkManager
+
+[Path]
+PathChanged=/run/NetworkManager
+MakeDirectory=true
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-resolvconf.service b/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-resolvconf.service
new file mode 100644
index 0000000..21cc095
--- /dev/null
+++ b/meta-citadel/recipes-citadel/citadel-config/files/systemd/watch-resolvconf.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Copy resolv.conf to /storage/citadel-state
+ConditionPathExists=/run/NetworkManager/resolv.conf
+ConditionPathExists=/storage/citadel-state
+[Service]
+Type=oneshot
+ExecStart=/bin/cp /run/NetworkManager/resolv.conf /storage/citadel-state/resolv.conf
\ No newline at end of file