diff --git a/evomaintenance/templates/evomaintenance.j2 b/evomaintenance/templates/evomaintenance.j2
index acb6fd46..79bc0cbf 100644
--- a/evomaintenance/templates/evomaintenance.j2
+++ b/evomaintenance/templates/evomaintenance.j2
@@ -1,11 +1,11 @@
 HOSTNAME={{ evomaintenance_hostname }}
 EVOMAINTMAIL={{ evomaintenance_alert_email or general_alert_email | mandatory }}
 
-export PGPASSWORD={{ evomaintenance_pg_passwd }}
+export PGPASSWORD={{ evomaintenance_pg_passwd | mandatory }}
 
-PGDB={{ evomaintenance_pg_db }}
-PGTABLE={{ evomaintenance_pg_table }}
-PGHOST={{ evomaintenance_pg_host }}
+PGDB={{ evomaintenance_pg_db | mandatory }}
+PGTABLE={{ evomaintenance_pg_table | mandatory }}
+PGHOST={{ evomaintenance_pg_host | mandatory }}
 FROM={{ evomaintenance_from }}
 FULLFROM="{{ evomaintenance_full_from }}"
 URGENCYFROM={{ evomaintenance_urgency_from }}