diff --git a/meta-facebook/recipes-core/systemd/systemd/40-system.conf b/meta-facebook/recipes-core/systemd/systemd/40-system.conf
new file mode 100644
index 0000000..10862b6
--- /dev/null
+++ b/meta-facebook/recipes-core/systemd/systemd/40-system.conf
@@ -0,0 +1,3 @@
+[Manager]
+RuntimeWatchdogSec=30s
+WatchdogDevice=/dev/watchdog
diff --git a/meta-facebook/recipes-core/systemd/systemd_%.bbappend b/meta-facebook/recipes-core/systemd/systemd_%.bbappend
new file mode 100644
index 0000000..c069b22
--- /dev/null
+++ b/meta-facebook/recipes-core/systemd/systemd_%.bbappend
@@ -0,0 +1,14 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append:bletchley = " \
+  file://40-system.conf \
+  "
+
+FILES:${PN}:append:bletchley = " \
+  ${systemd_unitdir}/system.conf.d/40-system.conf \
+  "
+
+do_install:append:bletchley() {
+    install -d -m 0755 ${D}${systemd_unitdir}/system.conf.d/
+    install -m 0644 ${WORKDIR}/40-system.conf ${D}${systemd_unitdir}/system.conf.d/
+}
\ No newline at end of file