diff --git a/roles/invite/templates/serverapplication.yml.j2 b/roles/invite/templates/serverapplication.yml.j2
index f38251766..3bc081840 100644
--- a/roles/invite/templates/serverapplication.yml.j2
+++ b/roles/invite/templates/serverapplication.yml.j2
@@ -106,7 +106,7 @@ config:
 voot:
   user: {{ invite.vootuser}}
   password: {{ invite.vootsecret}}
-  group_urn_domain: urn:mace:surf.nl:test.surfinvite.nl
+  group_urn_domain: "{{ invite.group_urn_domain }}"
 
 attribute-aggregation:
   user: {{ invite.attribute_aggregation_user }}
@@ -119,7 +119,7 @@ lifecyle:
 email:
   from: "{{ noreply_email }}"
   contactEmail: "{{ support_email }}"
-  environment: "test2"
+  environment: "{{ environment_shortname }}"
   enabled: true
 
 manage: