diff --git a/roles/custom/matrix-rageshake/defaults/main.yml b/roles/custom/matrix-rageshake/defaults/main.yml
index 77caeab1b..f104cbebd 100644
--- a/roles/custom/matrix-rageshake/defaults/main.yml
+++ b/roles/custom/matrix-rageshake/defaults/main.yml
@@ -93,7 +93,7 @@ matrix_rageshake_config_api_prefix: "{{ matrix_rageshake_scheme }}://{{ matrix_r
 #
 # For a more advanced customization, you can extend the default (see `matrix_rageshake_configuration_extension_yaml`)
 # or completely replace this variable with your own template.
-matrix_rageshake_configuration_yaml: "{{ lookup('template', 'templates/config.yml.j2') }}"
+matrix_rageshake_configuration_yaml: "{{ lookup('template', 'templates/config.yaml.j2') }}"
 
 matrix_rageshake_configuration_extension_yaml: |
   # Your custom YAML configuration for Synapse goes here.
diff --git a/roles/custom/matrix-rageshake/tasks/install.yml b/roles/custom/matrix-rageshake/tasks/install.yml
index 572f03f1f..33953de5e 100644
--- a/roles/custom/matrix-rageshake/tasks/install.yml
+++ b/roles/custom/matrix-rageshake/tasks/install.yml
@@ -19,7 +19,7 @@
 - name: Ensure rageshake config file created
   ansible.builtin.copy:
     content: "{{ matrix_rageshake_configuration | to_nice_yaml(indent=2, width=999999) }}"
-    dest: "{{ matrix_rageshake_config_path }}/config.yml"
+    dest: "{{ matrix_rageshake_config_path }}/config.yaml"
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
     mode: 0640
diff --git a/roles/custom/matrix-rageshake/templates/config.yml.j2 b/roles/custom/matrix-rageshake/templates/config.yaml.j2
similarity index 100%
rename from roles/custom/matrix-rageshake/templates/config.yml.j2
rename to roles/custom/matrix-rageshake/templates/config.yaml.j2
diff --git a/roles/custom/matrix-rageshake/templates/systemd/matrix-rageshake.service.j2 b/roles/custom/matrix-rageshake/templates/systemd/matrix-rageshake.service.j2
index 9abaf3db5..ba98d0e3a 100644
--- a/roles/custom/matrix-rageshake/templates/systemd/matrix-rageshake.service.j2
+++ b/roles/custom/matrix-rageshake/templates/systemd/matrix-rageshake.service.j2
@@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{{ arg }} \
 			{% endfor %}
 			{{ matrix_rageshake_container_image }} \
-			--config /config/config.yml
+			--config /config/config.yaml
 
 {% for network in matrix_rageshake_container_additional_networks %}
 ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-rageshake