diff --git a/conf/obmc-console-ssh@.service.d/use-socket.conf.in b/conf/obmc-console-ssh@.service.d/use-socket.conf.in
index 99fc9e3..3f827dd 100644
--- a/conf/obmc-console-ssh@.service.d/use-socket.conf.in
+++ b/conf/obmc-console-ssh@.service.d/use-socket.conf.in
@@ -1,5 +1,9 @@
 [Service]
 EnvironmentFile=-/etc/obmc-console/dropbear.env
 ExecStart=
-ExecStart=-/usr/sbin/dropbear -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key -c "/usr/bin/obmc-console-client" -i $DROPBEAR_EXTRA_ARGS
+ExecStart=-/usr/sbin/dropbear -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key \
+                              -r ${DROPBEAR_RSAKEY_DIR}/dropbear_ecdsa_host_key \
+                              -r ${DROPBEAR_RSAKEY_DIR}/dropbear_ed25519_host_key \
+                              -c "/usr/bin/obmc-console-client" \
+                              -i $DROPBEAR_EXTRA_ARGS
 StandardInput=socket
diff --git a/conf/obmc-console-ssh@.service.in b/conf/obmc-console-ssh@.service.in
index 098dd55..7ea7d35 100644
--- a/conf/obmc-console-ssh@.service.in
+++ b/conf/obmc-console-ssh@.service.in
@@ -9,7 +9,13 @@
 EnvironmentFile=/etc/obmc-console/dropbear.env
 EnvironmentFile=-/etc/obmc-console/dropbear.%i.env
 EnvironmentFile=-/etc/default/obmc-console-client
-ExecStart=/usr/sbin/dropbear -K 5 -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key -c "/usr/bin/obmc-console-client -c /etc/obmc-console/client.%i.conf" -p %i -F $DROPBEAR_EXTRA_ARGS
+ExecStart=/usr/sbin/dropbear -K 5 \
+                             -r ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key \
+                             -r ${DROPBEAR_RSAKEY_DIR}/dropbear_ecdsa_host_key \
+                             -r ${DROPBEAR_RSAKEY_DIR}/dropbear_ed25519_host_key \
+                             -c "/usr/bin/obmc-console-client -c /etc/obmc-console/client.%i.conf" \
+                             -p %i \
+                             -F $DROPBEAR_EXTRA_ARGS
 SyslogIdentifier=console-client-%i
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process