diff --git a/meta-quanta/meta-s6q/conf/machine/s6q.conf b/meta-quanta/meta-s6q/conf/machine/s6q.conf
index d32ac7a..b57652f 100644
--- a/meta-quanta/meta-s6q/conf/machine/s6q.conf
+++ b/meta-quanta/meta-s6q/conf/machine/s6q.conf
@@ -18,6 +18,7 @@
         obmc-phosphor-chassis-mgmt \
         obmc-phosphor-fan-mgmt \
         obmc-phosphor-flash-mgmt \
+        bonding \
         "
 
 VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager"
diff --git a/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/10-bmc-bond0.netdev b/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/10-bmc-bond0.netdev
new file mode 100644
index 0000000..f1dc3f7
--- /dev/null
+++ b/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/10-bmc-bond0.netdev
@@ -0,0 +1,3 @@
+[NetDev]
+Name=bond0
+Kind=bond
diff --git a/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/bond-eth0.conf b/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/bond-eth0.conf
new file mode 100644
index 0000000..c6ff6f1
--- /dev/null
+++ b/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/bond-eth0.conf
@@ -0,0 +1,2 @@
+[Network]
+Bond=bond0
diff --git a/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/bond-eth1.conf b/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/bond-eth1.conf
new file mode 100644
index 0000000..f1374ed
--- /dev/null
+++ b/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/bond-eth1.conf
@@ -0,0 +1,4 @@
+[Network]
+Bond=bond0
+[Link]
+ActivationPolicy=always-down
diff --git a/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/s6q-resolv.conf b/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/s6q-resolv.conf
new file mode 100644
index 0000000..9eabae1
--- /dev/null
+++ b/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf/s6q-resolv.conf
@@ -0,0 +1,3 @@
+[Resolve]
+LLMNR=no
+MulticastDNS=resolve
diff --git a/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf_%.bbappend b/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf_%.bbappend
new file mode 100644
index 0000000..519ca8d
--- /dev/null
+++ b/meta-quanta/meta-s6q/recipes-core/systemd/systemd-conf_%.bbappend
@@ -0,0 +1,24 @@
+FILESEXTRAPATHS:prepend:s6q := "${THISDIR}/${PN}:"
+
+SRC_URI:append:s6q = "file://s6q-resolv.conf"
+SRC_URI:append:s6q = "${@bb.utils.contains('MACHINE_FEATURES', 'bonding', ' file://10-bmc-bond0.netdev', '', d)}"
+SRC_URI:append:s6q = "${@bb.utils.contains('MACHINE_FEATURES', 'bonding', ' file://bond-eth0.conf', '', d)}"
+SRC_URI:append:s6q = "${@bb.utils.contains('MACHINE_FEATURES', 'bonding', ' file://bond-eth1.conf', '', d)}"
+
+FILES:${PN}:append:s6q = "${sysconfdir_native}/systemd/resolved.conf.d/s6q-resolv.conf"
+FILES:${PN}:append:s6q = "${@bb.utils.contains("MACHINE_FEATURES", "bonding", " ${sysconfdir_native}/systemd/network/10-bmc-bond0.netdev", "", d)}"
+FILES:${PN}:append:s6q = "${@bb.utils.contains("MACHINE_FEATURES", "bonding", " ${sysconfdir_native}/systemd/network/00-bmc-eth0.network.d/bond-eth0.conf", "", d)}"
+FILES:${PN}:append:s6q = "${@bb.utils.contains("MACHINE_FEATURES", "bonding", " ${sysconfdir_native}/systemd/network/00-bmc-eth1.network.d/bond-eth1.conf", "", d)}"
+
+do_install:append:s6q() {
+    install -d ${D}${sysconfdir_native}/systemd/resolved.conf.d/
+    install -m 0644 ${WORKDIR}/s6q-resolv.conf ${D}${sysconfdir_native}/systemd/resolved.conf.d/
+    if ${@bb.utils.contains('MACHINE_FEATURES', 'bonding', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir_native}/systemd/network/
+        install -d ${D}${sysconfdir_native}/systemd/network/00-bmc-eth0.network.d/
+        install -d ${D}${sysconfdir_native}/systemd/network/00-bmc-eth1.network.d/
+        install -m 0644 ${WORKDIR}/bond-eth0.conf ${D}${sysconfdir_native}/systemd/network/00-bmc-eth0.network.d/
+        install -m 0644 ${WORKDIR}/bond-eth1.conf ${D}${sysconfdir_native}/systemd/network/00-bmc-eth1.network.d/
+        install -m 0644 ${WORKDIR}/10-bmc-bond0.netdev ${D}${sysconfdir_native}/systemd/network
+    fi
+}