diff --git a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_git.bb b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_git.bb
new file mode 100644
index 0000000..0f1bc3a
--- /dev/null
+++ b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_git.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Command-line interface"
+DESCRIPTION = "YADRO OpenBMC Command Line Interface for end users"
+HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-cli"
+PR = "r1"
+PV = "1.0+git${SRCPV}"
+
+# License info
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+# Dependencies
+DEPENDS = "phosphor-user-manager"
+RDEPENDS_${PN} = "sudo bash"
+
+# Besides executable file we also have shared help
+FILES_${PN} += "${datadir}/cli.help"
+
+# Custom installation procedure
+do_install() {
+  ${B}/install.sh \
+    --dir ${D} \
+    --machine ${MACHINE} \
+    --admin priv-admin \
+    --operator priv-operator \
+    --user priv-user
+}
+
+# Source code repository
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-cli"
+SRCREV = "406688be909c702cbaecdf06147dc3b832c37f99"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
index b2b27da..46b1dec 100644
--- a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,4 +1,7 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd \
-                                    openpower-fru-vpd \
-                                    first-boot-set-mac \
-                                    first-boot-set-hostname"
+OBMC_IMAGE_EXTRA_INSTALL_append = " \
+    first-boot-set-hostname \
+    first-boot-set-mac \
+    mboxd \
+    obmc-yadro-cli \
+    openpower-fru-vpd \
+"