diff --git a/recipes-core/systemd-conf/files/eth.network b/recipes-core/systemd-conf/files/eth.network
new file mode 100644
index 0000000000000000000000000000000000000000..f7442909d8185251d6d6891a798d04d6ada6f657
--- /dev/null
+++ b/recipes-core/systemd-conf/files/eth.network
@@ -0,0 +1,7 @@
+[Match]
+Name=eth*
+KernelCommandLine=!nfsroot
+
+[Network]
+DNS=10.99.250.250
+Gateway=10.99.250.250
\ No newline at end of file
diff --git a/recipes-core/systemd-conf/systemd-conf_%.bbappend b/recipes-core/systemd-conf/systemd-conf_%.bbappend
new file mode 100644
index 0000000000000000000000000000000000000000..00682fd58d0bd78e81c4085bf55123aab2510202
--- /dev/null
+++ b/recipes-core/systemd-conf/systemd-conf_%.bbappend
@@ -0,0 +1,14 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI += " \
+    file://eth.network \
+"
+
+FILES:${PN} += " \
+    ${sysconfdir}/systemd/network/eth.network \
+"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}/systemd/network
+    install -m 0644 ${WORKDIR}/eth.network ${D}${sysconfdir}/systemd/network
+}
\ No newline at end of file
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
new file mode 100644
index 0000000000000000000000000000000000000000..0361777f927910a9a70b4ffc76cedeafa65cae69
--- /dev/null
+++ b/recipes-core/systemd/systemd_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:append = " networkd resolved"
diff --git a/recipes-support/swupdate/swupdate/rpi/09-swupdate-args b/recipes-support/swupdate/swupdate/rpi/09-swupdate-args
index 38dc88d6bb16f3081f7e8b6928c429f1a67219f9..681dda1013ea22ec50c6157ac604fd4c13945182 100644
--- a/recipes-support/swupdate/swupdate/rpi/09-swupdate-args
+++ b/recipes-support/swupdate/swupdate/rpi/09-swupdate-args
@@ -1,6 +1,6 @@
 rootfs=`swupdate -g`
 
-if [ $rootfs == '/dev/mmcblk0p3' ];then
+if [ $rootfs == '/dev/mmcblk0p2' ];then
 	selection="-e stable,copy2"
 else
 	selection="-e stable,copy1"
diff --git a/recipes-support/swupdate/swupdate_%.bbappend b/recipes-support/swupdate/swupdate_%.bbappend
index dc8a2d702829731bb8ae53d855acd59a401dbbc4..5b39f32f4abd9a01b7319e2a1d85c5b889dfe3f8 100644
--- a/recipes-support/swupdate/swupdate_%.bbappend
+++ b/recipes-support/swupdate/swupdate_%.bbappend
@@ -1,7 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
-    file://09-swupdate-args \
     file://swupdate.cfg \
     file://defconfig \
     "
diff --git a/recipes/files/halibut.conf b/recipes/files/halibut.conf
new file mode 100644
index 0000000000000000000000000000000000000000..595c926d6623c400ed084f6c92aebf2305e2e5c6
--- /dev/null
+++ b/recipes/files/halibut.conf
@@ -0,0 +1,2 @@
+[Resolve]
+DNS=10.99.250.250
diff --git a/recipes/python3-halibut-ipconfig_git.bb b/recipes/python3-halibut-ipconfig_git.bb
index b3be596a393c78898fdb539fda16e9d32b31be39..5a83dbb654fa56622a0b22729bfc579f161c5266 100644
--- a/recipes/python3-halibut-ipconfig_git.bb
+++ b/recipes/python3-halibut-ipconfig_git.bb
@@ -14,13 +14,15 @@ FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/files:"
 SRC_URI = " \
     git://git.astron.nl/lofar2.0/halibut-ipconfig.git;branch=L2SS-2336-set_ip;rev=cd35480ac0faa0bb7a846b2775485ab9d5e7e3e9 \
     file://files/lofar.rules \
+    file://files/halibut.conf \
 "
 S = "${WORKDIR}/git"
 
 FILES:${PN} += "\
     ${systemd_unitdir}/system/*.service \
     ${systemd_unitdir}/system/multi-user.target.wants/halibut-ipconfig.service \
-    /etc/udev/rules.d/lofar.rules \
+    ${sysconfdir}/udev/rules.d/lofar.rules \
+    ${sysconfdir}/systemd/resolved.conf.d/halibut.conf \
 "
 
 DEPENDS += "python3-setuptools-scm-native"
@@ -51,6 +53,9 @@ do_install:append () {
     install -d ${D}${systemd_unitdir}/system/multi-user.target.wants
     ln -sf ../halibut-ipconfig.service ${D}${systemd_unitdir}/system/multi-user.target.wants/halibut-ipconfig.service
     echo "install LOFAR udev rules"
-	install -d ${D}/etc/udev/rules.d
-    install -m 0666 ${WORKDIR}/files/lofar.rules     ${D}/etc/udev/rules.d/lofar.rules
+	install -d ${D}/${sysconfdir}/udev/rules.d
+    install -m 0666 ${WORKDIR}/files/lofar.rules     ${D}/${sysconfdir}/udev/rules.d/lofar.rules
+    echo "install LOFAR resolved.conf"
+	install -d ${D}/${sysconfdir}/systemd/resolved.conf.d
+    install -m 0666 ${WORKDIR}/files/halibut.conf     ${D}/${sysconfdir}/systemd/resolved.conf.d/halibut.conf
 }