diff --git a/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index b58fc3b..13c434d 100644
--- a/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -2,8 +2,10 @@
 BMC_RO_MTD = "alt-bmc+bmc"
 BMC_KERNEL_MTD = "bmc"
 
-# Enable signature verification by DISTRO_FEATURE obmc-ubi-fs
-PACKAGECONFIG_append_df-obmc-ubi-fs = " verify_signature"
+# Enable signature verification
+PACKAGECONFIG_append_witherspoon = " verify_signature"
+PACKAGECONFIG_append_swift = " verify_signature"
 
 # Enable sync of persistent files to the alternate BMC chip
-PACKAGECONFIG_append_df-obmc-ubi-fs = " sync_bmc_files"
+PACKAGECONFIG_append_witherspoon = " sync_bmc_files"
+PACKAGECONFIG_append_swift = " sync_bmc_files"
diff --git a/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 6e0db1e..92b48f9 100644
--- a/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -2,4 +2,5 @@
 RDEPENDS_${PN}-fan-control += "witherspoon-fan-watchdog"
 RDEPENDS_${PN}-extras += "witherspoon-pfault-analysis witherspoon-power-supply-sync phosphor-webui"
 
-${PN}-software-extras_df-obmc-ubi-fs += "phosphor-software-manager-sync"
+${PN}-software-extras_append_witherspoon = " phosphor-software-manager-sync"
+${PN}-software-extras_append_swift = " phosphor-software-manager-sync"