diff --git a/roles/xymon-client/tasks/client_centos.yml b/roles/xymon-client/tasks/client_centos.yml
index 6cbf799..6bd6f26 100644
--- a/roles/xymon-client/tasks/client_centos.yml
+++ b/roles/xymon-client/tasks/client_centos.yml
@@ -48,6 +48,6 @@
   tags:
     - xymon-client
     - client-configuration
-  lineinfile: name=/etc/sysconfig/xymon-client regexp='^CLIENTHOSTNAME=' line='CLIENTHOSTNAME="{{ansible_fqdn}}"'
+  lineinfile: name=/etc/sysconfig/xymon-client regexp='^CLIENTHOSTNAME=' line='CLIENTHOSTNAME="{{ansible_nodename}}"'
   notify: restart xymon-client
   when: ansible_distribution == 'CentOS' or ansible_distribution == 'CloudLinux' or ansible_distribution == 'Virtuozzo'
diff --git a/roles/xymon-client/tasks/client_debian.yml b/roles/xymon-client/tasks/client_debian.yml
index 172d09d..94ece56 100644
--- a/roles/xymon-client/tasks/client_debian.yml
+++ b/roles/xymon-client/tasks/client_debian.yml
@@ -58,7 +58,7 @@
   tags:
     - xymon-client
     - client-configuration
-  lineinfile: name=/etc/default/xymon-client regexp='^CLIENTHOSTNAME=' line='CLIENTHOSTNAME="{{ansible_fqdn}}"'
+  lineinfile: name=/etc/default/xymon-client regexp='^CLIENTHOSTNAME=' line='CLIENTHOSTNAME="{{ansible_nodename}}"'
   notify: restart xymon-client
   when: ansible_distribution == 'Debian' and ansible_distribution_major_version|int >= 8