diff --git a/gen-and-distrib-new-key.sh b/gen-and-distrib-new-key.sh
index ef70c34..270c2b1 100755
--- a/gen-and-distrib-new-key.sh
+++ b/gen-and-distrib-new-key.sh
@@ -17,6 +17,7 @@ echo target: ${target}
 targetname=${target}
 echo targetname=${targetname}
 hostname=$( (hostname -s) )
+hostname="${hostname}${CSHENV_MACHINE_SUFFIX}"
 echo hostname: ${hostname}
 keyname=id_${hostname}-${targetname}
 echo keyname: ${keyname}