diff --git a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager/yosemitev2/settings-manager.override.yml b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager/yosemitev2/settings-manager.override.yml
deleted file mode 100644
index 3fdc847..0000000
--- a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager/yosemitev2/settings-manager.override.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-/xyz/openbmc_project/control/host1/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
-
-/xyz/openbmc_project/control/host2/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
-
-/xyz/openbmc_project/control/host3/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
-
-/xyz/openbmc_project/control/host4/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
diff --git a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
deleted file mode 100644
index 56f43c7..0000000
--- a/meta-facebook/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:yosemitev2 = " file://settings-manager.override.yml"
diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/host-template.yaml b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/host-template.yaml
index 4088b82..3993518 100644
--- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/host-template.yaml
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/host-template.yaml
@@ -19,6 +19,10 @@
       Properties:
           BootMode:
               Default: Mode::Modes::Regular
+    - Interface: xyz.openbmc_project.Control.Boot.Type
+      Properties:
+          BootType:
+              Default: Type::Types::EFI
     - Interface: xyz.openbmc_project.Object.Enable
       Properties:
           Enabled: