diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console.bb b/meta-phosphor/common/recipes-phosphor/console/obmc-console.bb
index 8499400..76e3ba5 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console.bb
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console.bb
@@ -20,6 +20,7 @@
 REGISTERED_SERVICES_${PN} += "obmc_console:tcp:2200"
 OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0"
 SYSTEMD_SUBSTITUTIONS += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service"
+SYSTEMD_SUBSTITUTIONS += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket"
 
 SYSTEMD_SERVICE_${PN} = " \
         ${PN}@.service \
diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
index 5f297a7..7a7abb5 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
@@ -1,7 +1,6 @@
 [Unit]
 Description=Phosphor Host Console SSH Per-Connection socket
-Conflicts=obmc-console-ssh.service
-Requires=obmc-console.service
+Requires=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service
 
 [Socket]
 ListenStream=2200