diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 2c309f99e2..f7b8544807 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -276,7 +276,7 @@ function configure_manila {
     iniset $MANILA_CONF DEFAULT enabled_share_backends $MANILA_ENABLED_BACKENDS
 
     if [ ! -f $MANILA_PATH_TO_PRIVATE_KEY ]; then
-        ssh-keygen -N "" -t rsa -f $MANILA_PATH_TO_PRIVATE_KEY;
+        ssh-keygen -N "" -t $MANILA_KEY_FORMAT -f $MANILA_PATH_TO_PRIVATE_KEY;
     fi
 
     iniset $MANILA_CONF DEFAULT manila_service_keypair_name $MANILA_SERVICE_KEYPAIR_NAME
diff --git a/devstack/settings b/devstack/settings
index ab715fc45f..601a9320d9 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -117,8 +117,9 @@ fi
 SHARE_DRIVER=${SHARE_DRIVER:-manila.share.drivers.generic.GenericShareDriver}
 
 eval USER_HOME=~
-MANILA_PATH_TO_PUBLIC_KEY=${MANILA_PATH_TO_PUBLIC_KEY:-"$USER_HOME/.ssh/id_rsa.pub"}
-MANILA_PATH_TO_PRIVATE_KEY=${MANILA_PATH_TO_PRIVATE_KEY:-"$USER_HOME/.ssh/id_rsa"}
+MANILA_KEY_FORMAT=${MANILA_KEY_FORMAT:-"ecdsa"}
+MANILA_PATH_TO_PUBLIC_KEY=${MANILA_PATH_TO_PUBLIC_KEY:-"$USER_HOME/.ssh/id_${MANILA_KEY_FORMAT}.pub"}
+MANILA_PATH_TO_PRIVATE_KEY=${MANILA_PATH_TO_PRIVATE_KEY:-"$USER_HOME/.ssh/id_${MANILA_KEY_FORMAT}"}
 MANILA_SERVICE_KEYPAIR_NAME=${MANILA_SERVICE_KEYPAIR_NAME:-"manila-service"}
 
 MANILA_SERVICE_INSTANCE_USER=${MANILA_SERVICE_INSTANCE_USER:-"manila"}