diff --git a/miscellaneous/netcelery@.service b/miscellaneous/netcelery@.service
index 03808c0..1eb5799 100644
--- a/miscellaneous/netcelery@.service
+++ b/miscellaneous/netcelery@.service
@@ -11,4 +11,5 @@ TimeoutStopSec=600
 Restart=always
 
 WorkingDirectory=/home/cloud/vmdriver
-ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A netcelery worker --loglevel=info -n %H.%I"
+
+ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A netcelery worker --loglevel=info -n $(/bin/hostname -s).%I"
diff --git a/miscellaneous/vmcelery@.service b/miscellaneous/vmcelery@.service
index a100dfe..1597fae 100644
--- a/miscellaneous/vmcelery@.service
+++ b/miscellaneous/vmcelery@.service
@@ -11,4 +11,5 @@ TimeoutStopSec=600
 Restart=always
 
 WorkingDirectory=/home/cloud/vmdriver
-ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A vmcelery worker --loglevel=info -n %H.%I"
+
+ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A vmcelery worker --loglevel=info -n $(/bin/hostname -s).%I"