diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service
index b6bc04a..e9bbd1d 100644
--- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service
+++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=SSL/SSH multiplexer
-Requires=sslh.socket
+Requires=gbmc-ncsi-sslh.socket
+After=gbmc-ncsi-sslh.socket
 
 [Service]
 ExecStart=/usr/sbin/sslh -n -f --ssh [::1]:22 --http [::1]:80 --tls [::1]:443
diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in
index 9e5f594..c0abbc2 100644
--- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in
+++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-sslh.socket.in
@@ -1,6 +1,3 @@
-[Unit]
-Before=sslh.service
-
 [Socket]
 BindToDevice=@NCSI_IF@
 ListenStream=3967