diff --git a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 767d487..8168002 100644
--- a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -4,18 +4,9 @@
 
 STATE_MGR_PACKAGES:remove:kudo = " ${PN}-host-check"
 RRECOMMENDS:${PN}-host:remove:kudo = " ${PN}-host-check"
-EXTRA_OEMESON:append:kudo = " -Dhost-gpios=enabled"
+PACKAGECONFIG:append:kudo = " host-gpio"
 
 FILES:${PN}:append:kudo = " ${systemd_system_unitdir}/*"
-FILES:${PN}-host:append:kudo = " ${bindir}/phosphor-host-condition-gpio"
-SYSTEMD_SERVICE:${PN}-host:append:kudo = " phosphor-host-condition-gpio@.service"
-
-pkg_postinst:${PN}-obmc-targets:prepend:kudo() {
-    mkdir -p $D$systemd_system_unitdir/multi-user.target.requires
-    LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service"
-    TARGET="../phosphor-host-condition-gpio@.service"
-    ln -s $TARGET $LINK
-}
 
 pkg_postinst:${PN}-obmc-targets:append:kudo() {
     rm "$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/obmc-chassis-poweroff@0.target"
@@ -32,11 +23,6 @@
     rm "$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-host-running@0.service"
 }
 
-pkg_prerm:${PN}-obmc-targets:prepend:kudo() {
-    LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service"
-    rm $LINK
-}
-
 SRC_URI:append:kudo = " \
     file://xyz.openbmc_project.State.Chassis@.service \
     file://xyz.openbmc_project.State.Host@.service \
diff --git a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 2f05677..da65243 100644
--- a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -1,15 +1,11 @@
 FILESEXTRAPATHS:prepend:mori := "${THISDIR}/${PN}:"
-DEPENDS:append:mori = " gpioplus"
+PACKAGECONFIG:append:mori = " host-gpio"
 
 SRC_URI:append:mori = " \
     file://xyz.openbmc_project.State.Chassis@.service \
     file://xyz.openbmc_project.State.Host@.service \
 "
 
-SYSTEMD_SERVICE:${PN}-host:append:mori = " phosphor-host-condition-gpio@.service"
-
-EXTRA_OEMESON:append:mori = " -Dhost-gpios=enabled"
-
 do_install:append:mori() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Chassis@.service \
@@ -19,18 +15,7 @@
 }
 
 FILES:${PN}:append:mori = " ${systemd_system_unitdir}/*"
-FILES:${PN}-host:append:mori = " ${bindir}/phosphor-host-condition-gpio"
 
-pkg_prerm:${PN}-obmc-targets:prepend:mori() {
-    LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service"
-    rm $LINK
-}
-pkg_postinst:${PN}-obmc-targets:prepend:mori() {
-    mkdir -p $D$systemd_system_unitdir/multi-user.target.requires
-    LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service"
-    TARGET="../phosphor-host-condition-gpio@.service"
-    ln -s $TARGET $LINK
-}
 pkg_postinst:${PN}-obmc-targets:append:mori() {
     rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/obmc-host-shutdown@0.target"
     rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/phosphor-reboot-host@0.service"