diff --git a/roles/matrix_authentication_service/templates/config.yaml.j2 b/roles/matrix_authentication_service/templates/config.yaml.j2
index 0ebf64e..eb3dadc 100644
--- a/roles/matrix_authentication_service/templates/config.yaml.j2
+++ b/roles/matrix_authentication_service/templates/config.yaml.j2
@@ -46,11 +46,6 @@ passwords:
       algorithm: argon2id
   minimum_complexity: 3
 
-clients:
-  - client_id: 0000000000000000000SYNAPSE
-    client_auth_method: client_secret_basic
-    client_secret: "{{ matrix_authentication_service_client_secret }}"
-
 matrix:
   homeserver: {{ matrix_authentication_service_homeserver_name }}
   secret: "{{ matrix_authentication_service_homeserver_secret }}"
diff --git a/roles/synapse/templates/homeserver.yaml.j2 b/roles/synapse/templates/homeserver.yaml.j2
index 9e6a327..51b0e5b 100644
--- a/roles/synapse/templates/homeserver.yaml.j2
+++ b/roles/synapse/templates/homeserver.yaml.j2
@@ -106,12 +106,7 @@ auto_accept_invites: {{ synapse_auto_accept_invites }}
 auto_join_rooms: {{ synapse_auto_join_rooms }}
 autocreate_auto_join_rooms: false
 
-experimental_features:
-  msc3861:
-    enabled: true
-    issuer: http://matrix-authentication-service:8080/
-    client_id: 0000000000000000000SYNAPSE
-    client_auth_method: client_secret_basic
-    client_secret: "{{ service_podman_secrets['synapse-mas-client-secret'] }}"
-    admin_token: "{{ service_podman_secrets['synapse-mas-homeserver-secret'] }}"
-    account_management_url: "https://{{ synapse_mas_domain }}/account"
+matrix_authentication_service:
+  enabled: true
+  endpoint: http://matrix-authentication-service:8080/
+  secret: "{{ service_podman_secrets['synapse-mas-homeserver-secret'] }}"