diff --git a/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend b/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend
new file mode 100644
index 0000000..760a12a
--- /dev/null
+++ b/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend
@@ -0,0 +1,10 @@
+RDEPENDS_${PN}_append = " \
+    obmc-yadro-backup \
+    obmc-yadro-lsinventory \
+    op-proc-control \
+    openpower-esel-parser \
+    phosphor-debug-collector \
+    phosphor-led-manager-ledmanager \
+    phosphor-mapper \
+    phosphor-state-manager \
+"
diff --git a/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 59445b7..61bf12e 100644
--- a/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,13 +1,7 @@
 RDEPENDS_${PN}-inventory_append = " openpower-occ-control"
 RDEPENDS_${PN}-extras_append = " \
-    obmc-yadro-backup \
-    obmc-yadro-lsinventory \
-    obmc-yadro-lssensors \
-    obmc-yadro-netconfig \
-    openpower-esel-parser \
     phosphor-hostlogger \
 "
 RDEPENDS_${PN}-software_append = " \
     obmc-yadro-fwupdate \
-    phosphor-image-signing \
 "
diff --git a/recipes-phosphor/cli/obmc-yadro-cli_git.bb b/recipes-phosphor/cli/obmc-yadro-cli_git.bb
index fb2bcad..1cdecb0 100644
--- a/recipes-phosphor/cli/obmc-yadro-cli_git.bb
+++ b/recipes-phosphor/cli/obmc-yadro-cli_git.bb
@@ -10,7 +10,19 @@
 
 # Dependencies
 DEPENDS = "phosphor-user-manager"
-RDEPENDS_${PN} = "sudo bash"
+RDEPENDS_${PN} = " \
+    ${VIRTUAL-RUNTIME_base-utils} \
+    bash \
+    obmc-console \
+    obmc-yadro-fwupdate \
+    obmc-yadro-lssensors \
+    obmc-yadro-netconfig \
+    sudo \
+    systemd \
+"
+# Some platforms also require some additional packages like
+#   ipmitool, obmc-yadro-lsinventory, obmc-yadro-backup ...
+# They should be appended by bbappend file in their layers
 
 # Directory with command handlers
 FILES_${PN} += "${datadir}/cli"
@@ -28,4 +40,4 @@
 # Source code repository
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-cli"
-SRCREV = "1b0347f2c638df21333c5479b4d3152cfc4b5ac1"
+SRCREV = "9457a085c86722214d6c450397ccecd6db4a1071"