diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/BootMode-default-setup.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/BootMode-default-setup.override.yml
new file mode 100644
index 0000000..5ea22b9
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/BootMode-default-setup.override.yml
@@ -0,0 +1,13 @@
+/xyz/openbmc_project/control/host0/boot:
+    - Interface: xyz.openbmc_project.Control.Boot.Source
+      Properties:
+          BootSource:
+              Default: Source::Sources::Default
+    - Interface: xyz.openbmc_project.Control.Boot.Mode
+      Properties:
+          BootMode:
+              Default: Mode::Modes::Regular
+    - Interface: xyz.openbmc_project.Object.Enable
+      Properties:
+          Enabled:
+              Default: 'false'
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 9205dc8..3e8f58c 100644
--- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -5,4 +5,5 @@
 SRC_URI:append = " file://ibm_settings.override.yml"
 SRC_URI:append:p10bmc = " file://HypervisorInterface-default-p10bmc.override.yml"
 SRC_URI:append:p10bmc = " file://TPMEnable-default-true.override.yml"
+SRC_URI:append:p10bmc += " file://BootMode-default-setup.override.yml"
 SRC_URI:append:witherspoon-tacoma = " file://HypervisorInterface-default-tacoma.override.yml"