diff --git a/roles/manage/templates/metadata_configuration/oidc10_rp.schema.json.j2 b/roles/manage/templates/metadata_configuration/oidc10_rp.schema.json.j2
index d7f47571c..91c784400 100644
--- a/roles/manage/templates/metadata_configuration/oidc10_rp.schema.json.j2
+++ b/roles/manage/templates/metadata_configuration/oidc10_rp.schema.json.j2
@@ -372,6 +372,11 @@
           "format": "uuid",
           "info": "This is a 128 bit number also known as a globally unique identifier (GUID or UUID) for this service."
         },
+        "eduIDInstitutionGuid": {
+          "type": "string",
+          "format": "uuid",
+          "info": "This is a 128 bit number used in the eduID generation for this service."
+        },
         "coin:no_consent_required": {
           "type": "boolean",
           "info": "Select this option to skip the consent for a user.",
diff --git a/roles/manage/templates/metadata_configuration/saml20_sp.schema.json.j2 b/roles/manage/templates/metadata_configuration/saml20_sp.schema.json.j2
index 9914fbef1..06fae95c6 100644
--- a/roles/manage/templates/metadata_configuration/saml20_sp.schema.json.j2
+++ b/roles/manage/templates/metadata_configuration/saml20_sp.schema.json.j2
@@ -459,6 +459,11 @@
           "format": "uuid",
           "info": "This is a 128 bit number also known as a globally unique identifier (GUID or UUID) for this service."
         },
+        "eduIDInstitutionGuid": {
+          "type": "string",
+          "format": "uuid",
+          "info": "This is a 128 bit number used in the eduID generation for this service."
+        },
         "coin:trusted_proxy": {
           "type": "boolean",
           "default": false,
diff --git a/roles/mujina-idp/templates/logback.xml.j2 b/roles/mujina-idp/templates/logback.xml.j2
index 1c2ddfb3b..6a725649d 100644
--- a/roles/mujina-idp/templates/logback.xml.j2
+++ b/roles/mujina-idp/templates/logback.xml.j2
@@ -8,6 +8,7 @@
  </appender>
 
   <logger name="mujina" level="DEBUG"/>
+  <logger name="org.springframework.security" level="DEBUG"/>
 
   <root level="INFO">
     <appender-ref ref="STDOUT" />
diff --git a/roles/mujina-sp/templates/logback.xml.j2 b/roles/mujina-sp/templates/logback.xml.j2
index 1c2ddfb3b..6a725649d 100644
--- a/roles/mujina-sp/templates/logback.xml.j2
+++ b/roles/mujina-sp/templates/logback.xml.j2
@@ -8,6 +8,7 @@
  </appender>
 
   <logger name="mujina" level="DEBUG"/>
+  <logger name="org.springframework.security" level="DEBUG"/>
 
   <root level="INFO">
     <appender-ref ref="STDOUT" />
diff --git a/roles/myconext/templates/application.yml.j2 b/roles/myconext/templates/application.yml.j2
index 70a23da11..d48a72d10 100644
--- a/roles/myconext/templates/application.yml.j2
+++ b/roles/myconext/templates/application.yml.j2
@@ -133,6 +133,10 @@ feature:
     allow_location: "classpath:/deny-allow/allowed.json"
   # Do we allow the create-from-institution flow
   create_eduid_institution_enabled: {{ myconext.feature_create_eduid_institution_enabled }}
+  # Do we email the eduID account when an institutional account gets linked to it
+  send_link_notification_to_eduid_account: True
+  # Do we email the institutional account when it gets linked to an eduID account
+  send_link_notification_to_linked_account: True
   # Do we show the landing page for the create-from-institution flow
   create_eduid_institution_landing: {{ myconext.feature_create_eduid_institution_landing }}
   # Do we default remember the user for a longer period
@@ -168,7 +172,7 @@ feature:
   use_global_uid: {{ myconext.feature_use_global_uid }}
   # SP entityIds that always receive the global uid in the uid and eduPersonPrincipalName SAML attributes,
   # even when use_global_uid is false.
-  force_global_uid_entities: "{{ myconext.feature_force_global_uid_entities }}"
+  force_global_uid_entities: {{ myconext.feature_force_global_uid_entities + ['mijn.' + myconext_base_domain] }}
 
 default_affiliate_email_domain: eduid.nl
 
@@ -361,12 +365,25 @@ management:
     health:
       access: unrestricted
       show-details: always
+      status:
+        http-mapping:
+          down: 200
+          out-of-service: 200
+          unknown: 200
+          warning: 200
+      probes:
+        enabled: false
     prometheus:
       access: read_only
     mappings:
       access: none
     metrics:
       access: unrestricted
+  health:
+    ssl:
+      enabled: false
+    readinessstate:
+      enabled: off
   info:
     git:
       mode: full