diff --git a/fabfile/tasks/ha.py b/fabfile/tasks/ha.py
index 4a78ef442..11af146d9 100644
--- a/fabfile/tasks/ha.py
+++ b/fabfile/tasks/ha.py
@@ -580,7 +580,7 @@ def fix_cmon_param_and_add_keys_to_compute():
     amqp_host_list = []
     for host_string in env.roledefs[amqp_in_role]:
         with settings(host_string=host_string, password=get_env_passwords(host_string)):
-            host_name = sudo('hostname')
+            host_name = sudo('hostname -s')
         amqp_host_list.append(host_name)
 
     computes = 'COMPUTES=("' + '" "'.join(compute_host_list) + '")'