diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml
index 28e35f7e9..7a8c917b6 100644
--- a/roles/custom/matrix-synapse/defaults/main.yml
+++ b/roles/custom/matrix-synapse/defaults/main.yml
@@ -425,7 +425,7 @@ matrix_synapse_form_secret: "{{ matrix_synapse_macaroon_secret_key }}"
 
 
 # Controls how to reach server admin, used in ResouceLimitError
-synapse_admin_contact: ~
+matrix_synapse_adminContact: ~  # noqa var-naming
 
 matrix_synapse_max_upload_size_mb: 50
 
diff --git a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
index 28da1fb4e..c833706d3 100644
--- a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -391,7 +391,7 @@ manhole_settings:
 
 # How to reach the server admin, used in ResourceLimitError
 #
-admin_contact: {{ synapse_admin_contact | to_json }}
+admin_contact: {{ matrix_synapse_adminContact | to_json }}
 
 # Global blocking
 #
diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
index ef377d5fe..d61119da8 100644
--- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
+++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
@@ -107,6 +107,7 @@
     - {'old': 'synapse_admin_public_endpoint', 'new': 'synapse_admin_path_prefix'}
     - {'old': 'synapse_admin_nginx_proxy_integration_enabled', 'new': '<removed>'}
     - {'old': 'synapse_admin_docker_image_name_prefix', 'new': 'synapse_admin_container_image_registry_prefix'}
+    - {'old': 'matrix_synapse_admin_contact', 'new': 'matrix_synapse_adminContact'}
 
 - name: (Deprecation) Catch and report matrix_postgres variables
   ansible.builtin.fail: