diff --git a/script/deploy.sh b/script/deploy.sh
index f0d450f..f4458f8 100755
--- a/script/deploy.sh
+++ b/script/deploy.sh
@@ -353,8 +353,8 @@ launch_gui() {
 setup_ssh() {
   echod "\n ✅ Generating new SSH key for numbus-admin..."
 
-  chmod 700 ${TMP_EXTRA_PATH}/home/numbus-admin/.ssh/
-  ssh-keygen -t "ed25519" -C "numbus-admin@numbus-server" -f "${TMP_EXTRA_PATH}/home/numbus-admin/.ssh/id_ed25519" -N "" -q
+  chmod 700 "${TMP_EXTRA_PATH}/home/numbus-admin/.ssh/"
+  ssh-keygen -t "ed25519" -C "numbus-admin@numbus-${DEVICE_TYPE}" -f "${TMP_EXTRA_PATH}/home/numbus-admin/.ssh/id_ed25519" -N "" -q
 
   if [[ ${DEBUG} -eq 1 ]]; then
   echo -e "\n ➡️  Copying SSH key to target host '${TARGET_USER}@${LIVE_TARGET_IP}'..."
@@ -781,6 +781,7 @@ LIVE_TARGET_IP="$(yq -r '.live_target.ip' ${LIVE_DATA_FILE})"
 LIVE_TARGET_PASSWORD="$(yq -r '.live_target.password' ${LIVE_DATA_FILE})"
 DEVICE_TYPE="$(yq -r '.device.type' ${LIVE_DATA_FILE})"
 
+setup_ssh
 hardware_detection
 
 until [[ -e web/signals/configuration_ready ]]; do