diff --git a/hdb_keymanager.sh b/hdb_keymanager.sh
index edffd60..b432f96 100644
--- a/hdb_keymanager.sh
+++ b/hdb_keymanager.sh
@@ -13,9 +13,11 @@ HDB_EXECUTABLE_PATH="/usr/sap/hdbclient/hdbuserstore"
 
 # --- Function: Create New Key ---
 create_new_key() {
+	current_hostname=$(hostname)
+
     echo -e "\n${COLOR_BLUE}🔑 --- Create New Secure Key ---${COLOR_NC}"
     read -p "Enter the Key Name [CRONKEY]: " key_name
-    read -p "Enter the HANA Host [hanasrv]: " hdb_host
+    read -p "Enter the HANA Host [${current_hostname}]: " hdb_host
     read -p "Enter the Instance Number [00]: " hdb_instance
     read -p "Enter the Tenant DB [NDB]: " hdb_tenant
     read -p "Enter the Database User [SYSTEM]: " hdb_user
@@ -23,7 +25,7 @@ create_new_key() {
     echo ""
 
     key_name=${key_name:-"CRONKEY"}
-    hdb_host=${hdb_host:-"hanasrv"}
+    hdb_host=${hdb_host:-$current_hostname}
     hdb_instance=${hdb_instance:-"00"}
     hdb_tenant=${hdb_tenant:-"NDB"}
     hdb_user=${hdb_user:-"SYSTEM"}