diff --git a/unomi.yml b/unomi.yml
index 2541e56..be10b99 100644
--- a/unomi.yml
+++ b/unomi.yml
@@ -303,7 +303,7 @@ actions:
   setupDatadogAgentEs:
     cmd[${this}]: |-
       DD_API_KEY=$(sed -n 's/DATADOGAPIKEY=\(.*\)/\1/p' < /.jelenv) bash -c "$(curl -L https://raw.githubusercontent.com/DataDog/datadog-agent/master/cmd/agent/install_script.sh)"
-      echo "hostname: es.${this}" >> /etc/datadog-agent/datadog.yaml
+      echo "hostname: es.$(hostname | sed 's/node\([0-9]*\).*/\1/g')" >> /etc/datadog-agent/datadog.yaml
       sed -i 's/# logs_enabled: false/logs_enabled: true/' /etc/datadog-agent/datadog.yaml
       echo "tags:" >> /etc/datadog-agent/datadog.yaml
       echo " - product:unomi" >> /etc/datadog-agent/datadog.yaml
diff --git a/update.yml b/update.yml
index 8548525..d798caf 100644
--- a/update.yml
+++ b/update.yml
@@ -210,7 +210,7 @@ actions:
   setupDatadogAgentEs:
     cmd[${this}]: |-
       DD_API_KEY=$(sed -n 's/DATADOGAPIKEY=\(.*\)/\1/p' < /.jelenv) bash -c "$(curl -L https://raw.githubusercontent.com/DataDog/datadog-agent/master/cmd/agent/install_script.sh)"
-      echo "hostname: es.${this}" >> /etc/datadog-agent/datadog.yaml
+      echo "hostname: es.$(hostname | sed 's/node\([0-9]*\).*/\1/g')" >> /etc/datadog-agent/datadog.yaml
       sed -i 's/# logs_enabled: false/logs_enabled: true/' /etc/datadog-agent/datadog.yaml
       echo "tags:" >> /etc/datadog-agent/datadog.yaml
       echo " - product:unomi" >> /etc/datadog-agent/datadog.yaml