diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native.bbappend
index 50c1ef9..15a8daa 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native.bbappend
@@ -1,6 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append = " \
-    file://yosemite4-bios-version.yml \
+SRC_URI:append = " file://yosemite4-bios-version.yml \
+                   file://yosemite4-disable-auto-reboot.override.yml \
 "
-SETTINGS_HOST_TEMPLATES:append = " yosemite4-bios-version.yml"
+
+SETTINGS_HOST_TEMPLATES:append = " yosemite4-bios-version.yml yosemite4-disable-auto-reboot.override.yml "
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native/yosemite4-disable-auto-reboot.override.yml b/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native/yosemite4-disable-auto-reboot.override.yml
new file mode 100644
index 0000000..f81fe75
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native/yosemite4-disable-auto-reboot.override.yml
@@ -0,0 +1,11 @@
+/xyz/openbmc_project/control/host{}/auto_reboot:
+    - Interface: xyz.openbmc_project.Control.Boot.RebootPolicy
+      Properties:
+          AutoReboot:
+             Default: 'false'
+
+/xyz/openbmc_project/control/host{}/auto_reboot/one_time:
+    - Interface: xyz.openbmc_project.Control.Boot.RebootPolicy
+      Properties:
+          AutoReboot:
+             Default: 'false'