diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index b97913b..2380c3a 100644
--- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -2,3 +2,7 @@
     /dev/ipmb-4 \
     /dev/ipmb-9 \
     "
+IPMB_REMOTE_ADDR:tiogapass = "\
+    44 \
+    96 \
+    "
diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index c064394..e072332 100644
--- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,18 +1,21 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 IPMB_CHANNELS ?= ""
+IPMB_REMOTE_ADDR ?= ""
 
 python do_ipmb_channels() {
     import json
     channels = []
+    ipmb_channel = d.getVar('IPMB_CHANNELS').split()
+    ipmb_remote_addr = d.getVar('IPMB_REMOTE_ADDR').split()
 
-    for channel in d.getVar('IPMB_CHANNELS').split():
+    for i in range(len(ipmb_channel)):
         channels.append({
             "type": "ipmb",
-            "slave-path": channel,
+            "slave-path": ipmb_channel[i],
             "bmc-addr": 32,
-            "remote-addr": 64,
-            "devIndex": len(channels)
+            "remote-addr": ipmb_remote_addr[i] if i < len(ipmb_remote_addr) else 64,
+            "devIndex": i
         })
 
     data = { "channels" : channels }