diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb
index 09fa126..fb2bcad 100644
--- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb
+++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb
@@ -12,14 +12,14 @@
 DEPENDS = "phosphor-user-manager"
 RDEPENDS_${PN} = "sudo bash"
 
-# Besides executable file we also have shared help
-FILES_${PN} += "${datadir}/cli.help"
+# Directory with command handlers
+FILES_${PN} += "${datadir}/cli"
 
 # Custom installation procedure
 do_install() {
   ${B}/install.sh \
     --dir ${D} \
-    --machine ${MACHINE} \
+    --machine ${@'${MACHINE}'.split('-')[0]} \
     --admin priv-admin \
     --operator priv-operator \
     --user priv-user
@@ -28,4 +28,4 @@
 # Source code repository
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-cli"
-SRCREV = "5408881b37890968b0a4ada8b35e81454df91321"
+SRCREV = "1b0347f2c638df21333c5479b4d3152cfc4b5ac1"