diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_uartmux_ctrl.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_uartmux_ctrl.sh
index a464adc..f3b94d2 100755
--- a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_uartmux_ctrl.sh
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_uartmux_ctrl.sh
@@ -28,36 +28,18 @@
 
 case "$1" in
 	1) GPIO_UARTx_MODE0=56
-	   # CPU0 UART0 connects to BMC UART1
-	   CONSOLE_PORT=0
 	;;
 	2) GPIO_UARTx_MODE0=57
-	   # CPU0 UART1 connects to BMC UART2
-	   CONSOLE_PORT=1
 	;;
 	3) GPIO_UARTx_MODE0=58
-	   # CPU0 UART4 connects to BMC UART3
-	   CONSOLE_PORT=2
 	;;
 	4) GPIO_UARTx_MODE0=59
-	   # CPU1 UART1 connects to BMC UART4
-	   CONSOLE_PORT=3
 	;;
 	*) echo "Invalid UART port selection"
 	   exit 1
 	;;
 esac
 
-# Only switch the MUX when there is no active connection. This means we only
-# switch the MUX before the first session starts and after the last session
-# closes. We do this by querying number of connected sessions to the socket
-# of requested console port.
-# Example format:  Accepted: 1; Connected: 1;
-CONNECTED=$(systemctl --no-pager status obmc-console-ttyS${CONSOLE_PORT}-ssh.socket | grep -w Connected | cut -d ':' -f 3 | tr -d ' ;')
-if [ ! "$CONNECTED" -le 1 ]; then
-	exit 0
-fi
-
 echo "Ampere UART MUX CTRL UART port $1 to mode $2"
 
 case "$2" in
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend
index 38040f4..26a356d 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,21 +1,22 @@
 FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
 RDEPENDS:${PN} += "bash"
 
-# Remove what installed by common recipe
-OBMC_CONSOLE_HOST_TTY = ""
-SYSTEMD_SUBSTITUTIONS:remove = "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket"
-
 # Declare port spcific config files
 OBMC_CONSOLE_TTYS = "ttyS0 ttyS1 ttyS2 ttyS3"
 CONSOLE_CLIENT = "2200 2201 2202 2203"
 
 CONSOLE_SERVER_CONF_FMT = "file://server.{0}.conf"
 CONSOLE_CLIENT_CONF_FMT = "file://client.{0}.conf"
+CONSOLE_CLIENT_SERVICE_FMT = "obmc-console-ssh@{0}.service"
 
-SRC_URI += " ${@compose_list(d, 'CONSOLE_SERVER_CONF_FMT', 'OBMC_CONSOLE_TTYS')} \
+SRC_URI += " \
+             ${@compose_list(d, 'CONSOLE_SERVER_CONF_FMT', 'OBMC_CONSOLE_TTYS')} \
              ${@compose_list(d, 'CONSOLE_CLIENT_CONF_FMT', 'CONSOLE_CLIENT')} \
            "
 
+SYSTEMD_SERVICE:${PN}:append = " \
+                                  ${@compose_list(d, 'CONSOLE_CLIENT_SERVICE_FMT', 'CONSOLE_CLIENT')} \
+                                "
 SYSTEMD_SERVICE:${PN}:remove = "obmc-console-ssh.socket"
 
 FILES:${PN}:remove = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf"
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend
index a715f28..605c9e1 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,21 +1,22 @@
 FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
 RDEPENDS:${PN} += "bash"
 
-# Remove what installed by common recipe
-OBMC_CONSOLE_HOST_TTY = ""
-SYSTEMD_SUBSTITUTIONS:remove = "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket"
-
 # Declare port spcific config files
 OBMC_CONSOLE_TTYS = "ttyS0 ttyS1 ttyS2 ttyS3 ttyS7 ttyS8"
 CONSOLE_CLIENT = "2200 2201 2202 2203 2204 2205"
 
 CONSOLE_SERVER_CONF_FMT = "file://server.{0}.conf"
 CONSOLE_CLIENT_CONF_FMT = "file://client.{0}.conf"
+CONSOLE_CLIENT_SERVICE_FMT = "obmc-console-ssh@{0}.service"
 
-SRC_URI += " ${@compose_list(d, 'CONSOLE_SERVER_CONF_FMT', 'OBMC_CONSOLE_TTYS')} \
+SRC_URI += " \
+             ${@compose_list(d, 'CONSOLE_SERVER_CONF_FMT', 'OBMC_CONSOLE_TTYS')} \
              ${@compose_list(d, 'CONSOLE_CLIENT_CONF_FMT', 'CONSOLE_CLIENT')} \
            "
 
+SYSTEMD_SERVICE:${PN}:append = " \
+                                  ${@compose_list(d, 'CONSOLE_CLIENT_SERVICE_FMT', 'CONSOLE_CLIENT')} \
+                                "
 SYSTEMD_SERVICE:${PN}:remove = "obmc-console-ssh.socket"
 
 FILES:${PN}:remove = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf"