diff --git a/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
index 88d0fa9..48e0d6d 100644
--- a/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ b/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend
@@ -26,6 +26,8 @@
 OBMC_IMAGE_EXTRA_INSTALL:append:mori = " phosphor-user-manager"
 
 # Required from packagegroup-mori-apps
+OBMC_IMAGE_EXTRA_INSTALL:append:mori = " obmc-phosphor-buttons-signals"
+OBMC_IMAGE_EXTRA_INSTALL:append:mori = " obmc-phosphor-buttons-handler"
 OBMC_IMAGE_EXTRA_INSTALL:append:mori = " ncsid"
 OBMC_IMAGE_EXTRA_INSTALL:append:mori = " gbmc-mac-config"
 OBMC_IMAGE_EXTRA_INSTALL:append:mori = " entity-manager"
diff --git a/meta-fii/meta-mori/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-fii/meta-mori/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
new file mode 100644
index 0000000..1017218
--- /dev/null
+++ b/meta-fii/meta-mori/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
@@ -0,0 +1,31 @@
+{
+    "gpio_configs": {
+
+        "power_config": {
+            "power_good_in": "PGOOD",
+            "power_up_outs": [
+            ],
+            "reset_outs": [
+            ]
+        }
+    },
+
+    "gpio_definitions": [
+        {
+            "name": "PGOOD",
+            "num": 71,
+            "direction": "in"
+        },
+        {
+            "name": "POWER_BUTTON",
+            "num": 64,
+            "direction": "both"
+        },
+        {
+            "name": "RESET_BUTTON",
+            "num": 65,
+            "direction": "both"
+        }
+    ]
+}
+
diff --git a/meta-fii/meta-mori/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
new file mode 100644
index 0000000..2b62a49
--- /dev/null
+++ b/meta-fii/meta-mori/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS:append:mori := ":${THISDIR}/${PN}"
+
+SRC_URI:append:mori = " file://gpio_defs.json"
+