diff --git a/tools/src/main/shell/client.keygen.sh b/tools/src/main/shell/client.keygen.sh
index 981160a2a2..49cb2faaac 100755
--- a/tools/src/main/shell/client.keygen.sh
+++ b/tools/src/main/shell/client.keygen.sh
@@ -96,7 +96,7 @@ keytool -genkeypair -v \
   -keypass $CLIENT_KEY_PASSWORD \
   -storepass $CLIENT_KEYSTORE_PASSWORD \
   -keyalg $CLIENT_KEY_ALG \
-  -keysize $CLIENT_KEY_SIZE\
+  -groupname $CLIENT_KEY_GROUP_NAME \
   -validity 9999 \
   -dname "CN=$DOMAIN_SUFFIX, OU=$ORGANIZATIONAL_UNIT, O=$ORGANIZATION, L=$CITY, ST=$STATE_OR_PROVINCE, C=$TWO_LETTER_COUNTRY_CODE"
 
diff --git a/tools/src/main/shell/keygen.properties b/tools/src/main/shell/keygen.properties
index 4808f05b2f..239ec8dd48 100644
--- a/tools/src/main/shell/keygen.properties
+++ b/tools/src/main/shell/keygen.properties
@@ -16,8 +16,8 @@
 
 DOMAIN_SUFFIX="$(hostname)"
 SUBJECT_ALTERNATIVE_NAMES="ip:127.0.0.1"
-ORGANIZATIONAL_UNIT=Thingsboard
-ORGANIZATION=Thingsboard
+ORGANIZATIONAL_UNIT=ThingsBoard
+ORGANIZATION=ThingsBoard
 CITY="San Francisco"
 STATE_OR_PROVINCE=CA
 TWO_LETTER_COUNTRY_CODE=US
@@ -27,8 +27,8 @@ SERVER_KEY_PASSWORD=password
 
 SERVER_KEY_ALIAS="serveralias"
 SERVER_FILE_PREFIX="server"
-SERVER_KEY_ALG="RSA"
-SERVER_KEY_SIZE="2048"
+SERVER_KEY_ALG="EC"
+SERVER_KEY_GROUP_NAME="secp256r1"
 SERVER_KEYSTORE_DIR="/etc/thingsboard/conf"
 
 CLIENT_KEYSTORE_PASSWORD=password
@@ -36,5 +36,5 @@ CLIENT_KEY_PASSWORD=password
 
 CLIENT_KEY_ALIAS="clientalias"
 CLIENT_FILE_PREFIX="client"
-CLIENT_KEY_ALG="RSA"
-CLIENT_KEY_SIZE="2048"
+CLIENT_KEY_ALG="EC"
+CLIENT_KEY_GROUP_NAME="secp256r1"
diff --git a/tools/src/main/shell/server.keygen.sh b/tools/src/main/shell/server.keygen.sh
index 259e7faec1..d5379ba873 100755
--- a/tools/src/main/shell/server.keygen.sh
+++ b/tools/src/main/shell/server.keygen.sh
@@ -105,7 +105,7 @@ keytool -genkeypair -v \
   -keypass $SERVER_KEY_PASSWORD \
   -storepass $SERVER_KEYSTORE_PASSWORD \
   -keyalg $SERVER_KEY_ALG \
-  -keysize $SERVER_KEY_SIZE \
+  -groupname $SERVER_KEY_GROUP_NAME \
   -validity 9999 \
   $EXT