diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 451be48d4..f87ab3d0e 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -4317,6 +4317,8 @@ cinny_self_check_validate_certificates: "{{ matrix_playbook_ssl_enabled }}"
 
 cinny_base_path: "{{ matrix_base_data_path }}/client-cinny"
 
+cinny_hostname: "{{ matrix_server_fqn_cinny }}"
+
 ######################################################################
 #
 # /cinny
diff --git a/roles/custom/matrix-client-cinny/defaults/main.yml b/roles/custom/matrix-client-cinny/defaults/main.yml
index c4f80a40a..5023541bf 100644
--- a/roles/custom/matrix-client-cinny/defaults/main.yml
+++ b/roles/custom/matrix-client-cinny/defaults/main.yml
@@ -142,10 +142,6 @@ cinny_hsts_preload_enabled: false
 
 cinny_scheme: https
 
-# The hostname at which Cinny is served.
-# Only works with with Traefik reverse-proxying.
-cinny_hostname: "{{ matrix_server_fqn_cinny }}"
-
 # The path at which Cinny is exposed.
 # This value must either be `/` or not end with a slash (e.g. `/cinny`).
 cinny_path_prefix: /