diff --git a/cdist/conf/type/__hostname/gencode-remote b/cdist/conf/type/__hostname/gencode-remote
index ef8eda51..6760507f 100755
--- a/cdist/conf/type/__hostname/gencode-remote
+++ b/cdist/conf/type/__hostname/gencode-remote
@@ -22,7 +22,7 @@
 if [ -f "$__object/parameter/name" ]; then
     name="$(cat "$__object/parameter/name")"
 else
-    name="$__target_host"
+    name="$(echo "${__target_host%%.*}")"
 fi
 
 os=$(cat "$__global/explorer/os")