diff --git a/tariff/template_test.go b/tariff/template_test.go
index 429efad99..427d88045 100644
--- a/tariff/template_test.go
+++ b/tariff/template_test.go
@@ -12,6 +12,8 @@ var acceptable = []string{
 	"invalid zipcode",       // grünstromindex
 	"invalid apikey format", // octopusenergy
 	"missing region",        // octopusenergy
+	"missing securitytoken", // entsoe
+	"cannot define region and postcode simultaneously", // ngeso
 }
 
 func TestTemplates(t *testing.T) {
diff --git a/templates/definition/tariff/entsoe.yaml b/templates/definition/tariff/entsoe.yaml
index e2493283a..5a7fd4a2f 100644
--- a/templates/definition/tariff/entsoe.yaml
+++ b/templates/definition/tariff/entsoe.yaml
@@ -23,5 +23,6 @@ params:
   - preset: tariff-base
 render: |
   type: entsoe
-  region: {{ .region }}
+  securitytoken: {{ .securitytoken }}
+  domain: {{ .domain }}
   {{ include "tariff-base" . }}
diff --git a/templates/definition/tariff/ngeso.yaml b/templates/definition/tariff/ngeso.yaml
index ac6c9de6f..a63b5a17c 100644
--- a/templates/definition/tariff/ngeso.yaml
+++ b/templates/definition/tariff/ngeso.yaml
@@ -24,4 +24,4 @@ params:
 render: |
   type: ngeso
   region: {{ .region }}
-  postalcode: {{ .postalcode }}
+  postcode: {{ .postcode }}