diff --git a/inventory.j2 b/inventory.j2
index e81964fb04c0914b93b99cfa55ecc58aebcab0de..8e254ccd4f8070609528b9e34d7bbbd0a5b7b923 100644
--- a/inventory.j2
+++ b/inventory.j2
@@ -1,8 +1,8 @@
 
 
 [servers_for_performance_monitoring]
-{{ instance_ip_vm0 }} doml_element_name=vm0
-{{ instance_ip_vm1 }} doml_element_name=vm1
+{{ instance_ip_vm0 }} doml_element_name={{ instance_ip_vm0 }}
+{{ instance_ip_vm1 }} doml_element_name={{ instance_ip_vm1 }}
 
 [servers_for_performance_monitoring:vars]
 ansible_connection=ssh
diff --git a/main.yml b/main.yml
index 8abf9308346b4781aea42e82739531add5f90e98..b7cde935fef0e8e898d8ad44e69033d13ed4fb35 100644
--- a/main.yml
+++ b/main.yml
@@ -17,6 +17,7 @@
       when: item is not defined
       with_items:
         - pma_deployment_id
+        - doml_element_name
         - pma_influxdb_bucket
         - pma_influxdb_token
         - pma_influxdb_org
@@ -25,6 +26,7 @@
       debug:
         msg: 
           - "pma_deployment_id: {{ pma_deployment_id }}"
+          - "doml_element_name: {{ doml_element_name }}"
           - "pma_influxdb_bucket: {{ pma_influxdb_bucket }}"
           - "pma_influxdb_token: {{ pma_influxdb_token }}"
           - "pma_influxdb_org: {{ pma_influxdb_org }}"
diff --git a/vars/main.yaml b/vars/main.yaml
index eee24cc34fd3813a1c5a72329f35ebe8bae75a0f..ad44b3ed5b4d788e293786bbd5fada1f95aeeae2 100644
--- a/vars/main.yaml
+++ b/vars/main.yaml
@@ -27,3 +27,4 @@ telegraf_plugins_default:
   - plugin: processes
   - plugin: disk
   - plugin: net
+  - plugin: system