diff --git a/piacere_monitoring/main.yml b/piacere_monitoring/main.yml
index e1ed843230b499ad667dc0e06563abb3c4bc514e..d25c4c0759bb97fc6d445d1d790f7a46b4934fe4 100644
--- a/piacere_monitoring/main.yml
+++ b/piacere_monitoring/main.yml
@@ -3,7 +3,7 @@
     - name: Check parameters
       fail:
         msg: 'variable {{item}} not defined'
-      when: item is not defined
+      when: (item is not defined) or (item|length == 0)
       with_items:
         - pma_deployment_id
         - pma_influxdb_bucket
diff --git a/piacere_monitoring/vars/main.yaml b/piacere_monitoring/vars/main.yaml
index 80bf2edf61bbedf605a3113db2cf841d04cb67ef..b664b6f2b7655cd8aadd686fed1eee5d29d6d5f5 100644
--- a/piacere_monitoring/vars/main.yaml
+++ b/piacere_monitoring/vars/main.yaml
@@ -1,8 +1,8 @@
-pma_deployment_id: "{{ lookup('env', 'DEPLOYMENT_ID' ) or '123e4567-e89b-12d3-a456-426614174002' }}" 
-pma_influxdb_bucket:  "{{ lookup('env', 'INFLUXDB_BUCKET' ) or 'bucket' }}"
-pma_influxdb_token:  "{{ lookup('env', 'INFLUXDB_TOKEN' ) or 'piacerePassword' }}"
-pma_influxdb_org:  "{{ lookup('env', 'INFLUXDB_ORG' ) or 'piacere' }}"
-pma_influxdb_addr:  "{{ lookup('env', 'INFLUXDB_ADDR' ) or 'https://influxdb.pm.ci.piacere.digital.tecnalia.dev' }}"
+pma_deployment_id: "{{ lookup('env', 'DEPLOYMENT_ID' ) }}" 
+pma_influxdb_bucket:  "{{ lookup('env', 'INFLUXDB_BUCKET' }}"
+pma_influxdb_token:  "{{ lookup('env', 'INFLUXDB_TOKEN' }}"
+pma_influxdb_org:  "{{ lookup('env', 'INFLUXDB_ORG' ) }}"
+pma_influxdb_addr:  "{{ lookup('env', 'INFLUXDB_ADDR' ) }}"
 
 telegraf_agent_package_state: latest