diff --git a/meta-phosphor/recipes-core/dropbear/dropbear/dropbear.default b/meta-phosphor/recipes-core/dropbear/dropbear/dropbear.default
index b2f1ecc..0035ff5 100644
--- a/meta-phosphor/recipes-core/dropbear/dropbear/dropbear.default
+++ b/meta-phosphor/recipes-core/dropbear/dropbear/dropbear.default
@@ -1 +1 @@
-DROPBEAR_EXTRA_ARGS="-G priv-admin"
+DROPBEAR_EXTRA_ARGS="-G priv-admin -r /etc/dropbear/dropbear_ecdsa_host_key -r /etc/dropbear/dropbear_ed25519_host_key"
diff --git a/meta-phosphor/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-phosphor/recipes-core/dropbear/dropbear/dropbearkey.service
index dfeb17f..a07676b 100644
--- a/meta-phosphor/recipes-core/dropbear/dropbear/dropbearkey.service
+++ b/meta-phosphor/recipes-core/dropbear/dropbear/dropbearkey.service
@@ -12,6 +12,16 @@
         @BASE_BINDIR@/mkdir -p ${DROPBEAR_RSAKEY_DIR}; \
         @SBINDIR@/dropbearkey -t rsa -f ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key; \
      fi"
+ExecStart=@BASE_BINDIR@/sh -c \
+     "if [[ ! -f ${DROPBEAR_RSAKEY_DIR}/dropbear_ecdsa_host_key ]]; then \
+        @BASE_BINDIR@/mkdir -p ${DROPBEAR_RSAKEY_DIR}; \
+        @SBINDIR@/dropbearkey -t ecdsa -f ${DROPBEAR_RSAKEY_DIR}/dropbear_ecdsa_host_key -s 384; \
+     fi"
+ExecStart=@BASE_BINDIR@/sh -c \
+     "if [[ ! -f ${DROPBEAR_RSAKEY_DIR}/dropbear_ed25519_host_key ]]; then \
+        @BASE_BINDIR@/mkdir -p ${DROPBEAR_RSAKEY_DIR}; \
+        @SBINDIR@/dropbearkey -t ed25519 -f ${DROPBEAR_RSAKEY_DIR}/dropbear_ed25519_host_key; \
+     fi"
 RemainAfterExit=yes
 
 [Install]