diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/select-uart-mux b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/select-uart-mux
deleted file mode 100644
index f203836..0000000
--- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/select-uart-mux
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash -e
-# shellcheck source=meta-facebook/meta-minerva/recipes-minerva/plat-tool/files/minerva-common-functions
-# Select UART Mux: UART Mux for switching between MTIA blade 0~15
-# Usage: select-uart-mux <0-15>
-source /usr/libexec/minerva-common-functions
-
-convert_decimal_to_binary() {
-    decimal=$1
-
-    binary=""
-    for ((i = 3; i >= 0; i--)); do
-        bit=$(( (decimal >> i) & 1 ))
-        binary="${binary}${bit}"
-    done
-
-    echo "$binary"
-}
-
-uart_mux_select()
-{
-    local BLADE_INDEX=$1
-
-    if ((BLADE_INDEX >= 0)) && ((BLADE_INDEX < 16)); then
-        BINARY_INDEX=$(convert_decimal_to_binary "$BLADE_INDEX")
-
-        set_gpio BLADE_UART_SEL0 "${BINARY_INDEX:3:1}"
-        set_gpio BLADE_UART_SEL1 "${BINARY_INDEX:2:1}"
-        set_gpio BLADE_UART_SEL2 "${BINARY_INDEX:1:1}"
-        set_gpio BLADE_UART_SEL3 "${BINARY_INDEX:0:1}"
-    else
-        logger -p user.info "uart_mux_select: unknow blade index ($BLADE_INDEX)"
-        return 1
-    fi
-
-    return 0
-}
-
-BLADE_INDEX=$1
-uart_mux_select "$BLADE_INDEX"
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf
index 6622dd6..3971b24 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf
+++ b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf
@@ -1,3 +1,67 @@
+mux-gpios = BLADE_UART_SEL0,BLADE_UART_SEL1,BLADE_UART_SEL2,BLADE_UART_SEL3
 baud = 57600
-console-id = compute-blade
-logfile = /var/log/obmc-console-compute-blade.log
+console-id = ttyS5
+
+[compute_blade_1]
+mux-index = 0
+logfile = /var/log/obmc-console-compute_blade_1.log
+
+[compute_blade_2]
+mux-index = 1
+logfile = /var/log/obmc-console-compute_blade_2.log
+
+[compute_blade_3]
+mux-index = 2
+logfile = /var/log/obmc-console-compute_blade_3.log
+
+[compute_blade_4]
+mux-index = 3
+logfile = /var/log/obmc-console-compute_blade_4.log
+
+[compute_blade_5]
+mux-index = 4
+logfile = /var/log/obmc-console-compute_blade_5.log
+
+[compute_blade_6]
+mux-index = 5
+logfile = /var/log/obmc-console-compute_blade_6.log
+
+[compute_blade_7]
+mux-index = 6
+logfile = /var/log/obmc-console-compute_blade_7.log
+
+[compute_blade_8]
+mux-index = 7
+logfile = /var/log/obmc-console-compute_blade_8.log
+
+[compute_blade_9]
+mux-index = 8
+logfile = /var/log/obmc-console-compute_blade_9.log
+
+[compute_blade_10]
+mux-index = 9
+logfile = /var/log/obmc-console-compute_blade_10.log
+
+[compute_blade_11]
+mux-index = 10
+logfile = /var/log/obmc-console-compute_blade_11.log
+
+[compute_blade_12]
+mux-index = 11
+logfile = /var/log/obmc-console-compute_blade_12.log
+
+[compute_blade_13]
+mux-index = 12
+logfile = /var/log/obmc-console-compute_blade_13.log
+
+[compute_blade_14]
+mux-index = 13
+logfile = /var/log/obmc-console-compute_blade_14.log
+
+[compute_blade_15]
+mux-index = 14
+logfile = /var/log/obmc-console-compute_blade_15.log
+
+[compute_blade_16]
+mux-index = 15
+logfile = /var/log/obmc-console-compute_blade_16.log
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend
index f60b2d6..0d96922 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend
@@ -6,7 +6,6 @@
 
 SRC_URI:append = " \
     file://80-minerva-obmc-console-uart.rules \
-    file://select-uart-mux \
 "
 
 RDEPENDS:${PN}:append = " bash"
@@ -17,7 +16,4 @@
     install -d ${D}/${nonarch_base_libdir}/udev/rules.d
     rm -f ${D}/${nonarch_base_libdir}/udev/rules.d/80-obmc-console-uart.rules
     install -m 0644 ${WORKDIR}/80-minerva-obmc-console-uart.rules ${D}/${nonarch_base_libdir}/udev/rules.d
-
-    # Install script for selecting uart mux
-    install -m 0744 ${WORKDIR}/select-uart-mux ${D}${bindir}
 }