diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub
new file mode 100644
index 0000000..b8268e8
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+disable_i3c_hub()
+{
+    local unplugged_slot="$1"
+    local hub_path
+    local offset_file
+    local access_file
+    local current_port
+    local mask=1
+
+    if [ "$unplugged_slot" -lt 5 ]; then
+        hub_path="/sys/kernel/debug/i3c-hub-0-*/reg"
+        echo "Slot $unplugged_slot on i3c hub 0."
+    else
+        hub_path="/sys/kernel/debug/i3c-hub-1-*/reg"
+        echo "Slot $unplugged_slot on i3c hub 1."
+    fi
+
+    for file in $hub_path/{offset,access}; do
+        if [[ $file == *"/offset" ]]; then
+            offset_file="$file"
+        elif [[ $file == *"/access" ]]; then
+            access_file="$file"
+        fi
+    done
+
+    echo "Unlock i3c hub register."
+    echo 16 > "$offset_file"
+    echo 105 > "$access_file"
+
+    echo "Disable slot${unplugged_slot} i3c port."
+    echo 18 > "$offset_file"
+    current_port=$(cat "$access_file")
+    if [ "$unplugged_slot" -gt 4 ]; then
+        ((unplugged_slot=unplugged_slot-4))
+    fi
+    mask=$((mask << (--unplugged_slot)))
+    mask=$((~mask))
+    current_port=$((current_port & mask))
+    echo $current_port > "$access_file"
+
+    echo "Lock i3c hub register."
+    echo 16 > "$offset_file"
+    echo 0 > "$access_file"
+
+    exit 0
+}
+
+disable_i3c_hub "$1"
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub@.service
new file mode 100644
index 0000000..2ffa66b
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=slot-disable-i3c-hub:%i
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/phosphor-gpio-monitor/disable-i3c-hub %i
+SyslogIdentifier=slot-disable-i3c-hub %i
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub
new file mode 100644
index 0000000..f57c765
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+enable_i3c_hub()
+{
+    local plugged_slot="$1"
+    local hub_path
+    local offset_file
+    local access_file
+    local current_port
+    local mask=1
+
+    sleep 2
+    if [ "$plugged_slot" -lt 5 ]; then
+        hub_path="/sys/kernel/debug/i3c-hub-0-*/reg"
+        echo "Slot${plugged_slot} on i3c hub 0."
+    else
+        hub_path="/sys/kernel/debug/i3c-hub-1-*/reg"
+        echo "Slot${plugged_slot} on i3c hub 1."
+    fi
+
+    for file in $hub_path/{offset,access}; do
+        if [[ $file == *"/offset" ]]; then
+            offset_file="$file"
+        elif [[ $file == *"/access" ]]; then
+            access_file="$file"
+        fi
+    done
+
+    echo "Unlock i3c hub register."
+    echo 16 > "$offset_file"
+    echo 105 > "$access_file"
+
+    echo "Enable slot${plugged_slot} i3c port."
+    echo 18 > "$offset_file"
+    current_port=$(cat "$access_file")
+    if [ "$plugged_slot" -gt 4 ]; then
+        ((plugged_slot=plugged_slot-4))
+    fi
+    mask=$((mask << (--plugged_slot)))
+    current_port=$((current_port | mask))
+    echo $current_port > "$access_file"
+
+    echo "Lock i3c hub register."
+    echo 16 > "$offset_file"
+    echo 0 > "$access_file"
+
+    exit 0
+}
+
+enable_i3c_hub "$1"
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub@.service
new file mode 100644
index 0000000..4d9c083
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=slot-enable-i3c-hub:%i
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/phosphor-gpio-monitor/enable-i3c-hub %i
+SyslogIdentifier=slot-enable-i3c-hub %i
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json
index a5db14f..17a6cb1 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json
@@ -149,80 +149,120 @@
     {
         "Name": "PRSNT_SB_SLOT1_BMC_N",
         "LineName": "PRSNT_SB_SLOT1_N",
-        "EventMon": "FALLING",
+        "EventMon": "BOTH",
         "Targets": {
+            "RISING": [
+                "disable-i3c-hub@1.service"
+            ],
             "FALLING": [
-                "slot-hot-plug@1.service"]
+                "slot-hot-plug@1.service",
+                "enable-i3c-hub@1.service"
+            ]
         },
         "Continue": true
     },
     {
         "Name": "PRSNT_SB_SLOT2_BMC_N",
         "LineName": "PRSNT_SB_SLOT2_N",
-        "EventMon": "FALLING",
+        "EventMon": "BOTH",
         "Targets": {
+            "RISING": [
+                "disable-i3c-hub@2.service"
+            ],
             "FALLING": [
-                "slot-hot-plug@2.service"]
+                "slot-hot-plug@2.service",
+                "enable-i3c-hub@2.service"
+            ]
         },
         "Continue": true
     },
     {
         "Name": "PRSNT_SB_SLOT3_BMC_N",
         "LineName": "PRSNT_SB_SLOT3_N",
-        "EventMon": "FALLING",
+        "EventMon": "BOTH",
         "Targets": {
+            "RISING": [
+                "disable-i3c-hub@3.service"
+            ],
             "FALLING": [
-                "slot-hot-plug@3.service"]
+                "slot-hot-plug@3.service",
+                "enable-i3c-hub@3.service"
+            ]
         },
         "Continue": true
     },
     {
         "Name": "PRSNT_SB_SLOT4_BMC_N",
         "LineName": "PRSNT_SB_SLOT4_N",
-        "EventMon": "FALLING",
+        "EventMon": "BOTH",
         "Targets": {
+            "RISING": [
+                "disable-i3c-hub@4.service"
+            ],
             "FALLING": [
-                "slot-hot-plug@4.service"]
+                "slot-hot-plug@4.service",
+                "enable-i3c-hub@4.service"
+            ]
         },
         "Continue": true
     },
     {
         "Name": "PRSNT_SB_SLOT5_BMC_N",
         "LineName": "PRSNT_SB_SLOT5_N",
-        "EventMon": "FALLING",
+        "EventMon": "BOTH",
         "Targets": {
+            "RISING": [
+                "disable-i3c-hub@5.service"
+            ],
             "FALLING": [
-                "slot-hot-plug@5.service"]
+                "slot-hot-plug@5.service",
+                "enable-i3c-hub@5.service"
+            ]
         },
         "Continue": true
     },
     {
         "Name": "PRSNT_SB_SLOT6_BMC_N",
         "LineName": "PRSNT_SB_SLOT6_N",
-        "EventMon": "FALLING",
+        "EventMon": "BOTH",
         "Targets": {
+            "RISING": [
+                "disable-i3c-hub@6.service"
+            ],
             "FALLING": [
-                "slot-hot-plug@6.service"]
+                "slot-hot-plug@6.service",
+                "enable-i3c-hub@6.service"
+            ]
         },
         "Continue": true
     },
     {
         "Name": "PRSNT_SB_SLOT7_BMC_N",
         "LineName": "PRSNT_SB_SLOT7_N",
-        "EventMon": "FALLING",
+        "EventMon": "BOTH",
         "Targets": {
+            "RISING": [
+                "disable-i3c-hub@7.service"
+            ],
             "FALLING": [
-                "slot-hot-plug@7.service"]
+                "slot-hot-plug@7.service",
+                "enable-i3c-hub@7.service"
+            ]
         },
         "Continue": true
     },
     {
         "Name": "PRSNT_SB_SLOT8_BMC_N",
         "LineName": "PRSNT_SB_SLOT8_N",
-        "EventMon": "FALLING",
+        "EventMon": "BOTH",
         "Targets": {
+            "RISING": [
+                "disable-i3c-hub@8.service"
+            ],
             "FALLING": [
-                "slot-hot-plug@8.service"]
+                "slot-hot-plug@8.service",
+                "enable-i3c-hub@8.service"
+            ]
         },
         "Continue": true
     },
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 26006a2..09972a6 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -22,6 +22,10 @@
             file://slot-power-fault@.service \
             file://fan-board-efuse-fault \
             file://fan-board-efuse-fault@.service \
+            file://enable-i3c-hub \
+            file://enable-i3c-hub@.service \
+            file://disable-i3c-hub \
+            file://disable-i3c-hub@.service \
             "
 
 RDEPENDS:${PN}:append = " bash"
@@ -40,6 +44,8 @@
     slot-power-fault@.service \
     fan-board-efuse-fault@.service \
     reconfig-net-interface@.service \
+    enable-i3c-hub@.service \
+    disable-i3c-hub@.service \
     "
 
 SYSTEMD_AUTO_ENABLE = "enable"
@@ -59,6 +65,8 @@
     install -m 0644 ${WORKDIR}/slot-hsc-fault@.service ${D}${systemd_system_unitdir}/
     install -m 0644 ${WORKDIR}/slot-power-fault@.service ${D}${systemd_system_unitdir}/
     install -m 0644 ${WORKDIR}/fan-board-efuse-fault@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${WORKDIR}/enable-i3c-hub@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${WORKDIR}/disable-i3c-hub@.service ${D}${systemd_system_unitdir}/
     install -d ${D}${libexecdir}/${PN}
     install -m 0755 ${WORKDIR}/probe-slot-device ${D}${libexecdir}/${PN}/
     install -m 0755 ${WORKDIR}/reconfig-net-interface ${D}${libexecdir}/${PN}/
@@ -67,6 +75,8 @@
     install -m 0755 ${WORKDIR}/slot-hsc-fault ${D}${libexecdir}/${PN}/
     install -m 0755 ${WORKDIR}/slot-power-fault ${D}${libexecdir}/${PN}/
     install -m 0755 ${WORKDIR}/fan-board-efuse-fault ${D}${libexecdir}/${PN}/
+    install -m 0755 ${WORKDIR}/enable-i3c-hub ${D}${libexecdir}/${PN}/
+    install -m 0755 ${WORKDIR}/disable-i3c-hub ${D}${libexecdir}/${PN}/
     install -d ${D}/${bindir}
     install -m 0755 ${WORKDIR}/configure-nic-mctp-endpoint.sh ${D}/${bindir}/
 }