diff --git a/recipes-core/systemd/systemd/override-timeout.conf b/recipes-core/systemd/systemd/override-timeout.conf
new file mode 100644
index 00000000..63d269dd
--- /dev/null
+++ b/recipes-core/systemd/systemd/override-timeout.conf
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --timeout=10
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
new file mode 100644
index 00000000..be52ce71
--- /dev/null
+++ b/recipes-core/systemd/systemd_%.bbappend
@@ -0,0 +1,11 @@
+FILESEXTRAPATHS:append := "${THISDIR}/${BPN}:"
+
+SRC_URI += "\
+    file://override-timeout.conf \
+"
+
+do_install:append:qcom() {
+    install -d ${D}${systemd_unitdir}/system/systemd-networkd-wait-online.service.d
+    install -Dm 0644 ${WORKDIR}/sources/override-timeout.conf \
+            ${D}${systemd_unitdir}/system/systemd-networkd-wait-online.service.d
+}