diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index b4929c8c..8f655fa0 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -52,7 +52,7 @@ matrix_server_fqn_grafana: "stats.{{ matrix_domain }}"
 matrix_server_fqn_sygnal: "sygnal.{{ matrix_domain }}"
 
 # This is where you access the mautrix wsproxy push gateway.
-matrix_server_fqn_mautrix_wsproxy: "mautrix-wsproxy.{{ matrix_domain }}"
+matrix_server_fqn_mautrix_wsproxy: "wsproxy.{{ matrix_domain }}"
 
 matrix_federation_public_port: 8448
 
diff --git a/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml b/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml
index 4751b507..4c83b2b6 100644
--- a/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml
+++ b/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml
@@ -181,13 +181,6 @@
     mode: 0644
   when: matrix_nginx_proxy_base_domain_serving_enabled|bool
 
-- name: Ensure Matrix wsproxy-proxy configuration for base domain exists
-  template:
-    src: "{{ role_path }}/templates/nginx/conf.d/matrix-mautrix-wsproxy.conf.j2"
-    dest: "{{ matrix_nginx_proxy_confd_path }}/matrix-mautrix-wsproxy.conf"
-    mode: 0644
-  when: matrix_mautrix_wsproxy_enabled|bool
-
 #
 # Tasks related to setting up matrix-nginx-proxy
 #
@@ -315,12 +308,6 @@
     state: absent
   when: "not matrix_nginx_proxy_base_domain_serving_enabled|bool"
 
-- name: Ensure Matrix wsproxy-proxy configuration for base domain deleted
-  template:
-    path: "{{ matrix_nginx_proxy_confd_path }}/matrix-mautrix-wsproxy.conf"
-    state: absent
-  when: "not matrix_mautrix_wsproxy_enabled|bool"
-
 - name: Ensure Matrix nginx-proxy configuration for main config override deleted
   file:
     path: "{{ matrix_nginx_proxy_base_path }}/nginx.conf"