diff --git a/docs/configuring-dns.md b/docs/configuring-dns.md
index 3fcd0f92..86253458 100644
--- a/docs/configuring-dns.md
+++ b/docs/configuring-dns.md
@@ -42,6 +42,7 @@ When you're done configuring DNS, proceed to [Configuring the playbook](configur
 | [Etherpad](configuring-playbook-etherpad.md) collaborative text editor                                                  | CNAME | `etherpad`                     | -        | -      | -    | `matrix.<your-domain>`      |
 | [Hydrogen](configuring-playbook-client-hydrogen.md) web client                                                          | CNAME | `hydrogen`                     | -        | -      | -    | `matrix.<your-domain>`      |
 | [Cinny](configuring-playbook-client-cinny.md) web client                                                                | CNAME | `cinny`                        | -        | -      | -    | `matrix.<your-domain>`      |
+| [wsproxy](configuring-playbook-bridge-mautrix-wsproxy.md) sms bridge                                                    | CNAME | `wsproxy`                      | -        | -      | -    | `matrix.<your-domain>`      |
 | [Buscarron](configuring-playbook-bot-buscarron.md) helpdesk bot                                                         | CNAME | `buscarron`                    | -        | -      | -    | `matrix.<your-domain>`      |
 | [Postmoogle](configuring-playbook-bot-postmoogle.md)/[Email2Matrix](configuring-playbook-email2matrix.md) email bridges | MX    | `matrix`                       | 10       | 0      | -    | `matrix.<your-domain>`      |
 | [Postmoogle](configuring-playbook-bot-postmoogle.md) email bridge                                                       | TXT   | `matrix`                       | -        | -      | -    | `v=spf1 ip4:<your-ip> -all` |
diff --git a/roles/matrix-bridge-mautrix-wsproxy/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/defaults/main.yml
similarity index 100%
rename from roles/matrix-bridge-mautrix-wsproxy/defaults/main.yml
rename to roles/custom/matrix-bridge-mautrix-wsproxy/defaults/main.yml
diff --git a/roles/matrix-bridge-mautrix-wsproxy/tasks/init.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/init.yml
similarity index 100%
rename from roles/matrix-bridge-mautrix-wsproxy/tasks/init.yml
rename to roles/custom/matrix-bridge-mautrix-wsproxy/tasks/init.yml
diff --git a/roles/matrix-bridge-mautrix-wsproxy/tasks/main.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/main.yml
similarity index 100%
rename from roles/matrix-bridge-mautrix-wsproxy/tasks/main.yml
rename to roles/custom/matrix-bridge-mautrix-wsproxy/tasks/main.yml
diff --git a/roles/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
similarity index 95%
rename from roles/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
rename to roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
index 2404ae2f..1eec6411 100644
--- a/roles/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
+++ b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml
@@ -64,7 +64,7 @@
 - name: Ensure matrix-mautrix-wsproxy.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-mautrix-wsproxy.service.j2"
-    dest: "{{ matrix_systemd_path }}/matrix-mautrix-wsproxy.service"
+    dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-wsproxy.service"
     mode: 0644
   register: matrix_mautrix_wsproxy_systemd_service_result
 
@@ -82,7 +82,7 @@
 - name: Ensure matrix-mautrix-wsproxy-syncproxy.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-mautrix-wsproxy-syncproxy.service.j2"
-    dest: "{{ matrix_systemd_path }}/matrix-mautrix-wsproxy-syncproxy.service"
+    dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-wsproxy-syncproxy.service"
     mode: 0644
   register: matrix_mautrix_wsproxy_syncproxy_systemd_service_result
 
diff --git a/roles/matrix-bridge-mautrix-wsproxy/tasks/setup_uninstall.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_uninstall.yml
similarity index 79%
rename from roles/matrix-bridge-mautrix-wsproxy/tasks/setup_uninstall.yml
rename to roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_uninstall.yml
index 7c693ad1..c39fd29f 100644
--- a/roles/matrix-bridge-mautrix-wsproxy/tasks/setup_uninstall.yml
+++ b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_uninstall.yml
@@ -2,7 +2,7 @@
 
 - name: Check existence of matrix-mautrix-wsproxy service
   ansible.builtin.stat:
-    path: "{{ matrix_systemd_path }}/matrix-mautrix-wsproxy.service"
+    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-wsproxy.service"
   register: matrix_mautrix_wsproxy_service_stat
 
 - name: Ensure matrix-mautrix-wsproxy is stopped
@@ -14,7 +14,7 @@
 
 - name: Ensure matrix-mautrix-wsproxy.service doesn't exist
   ansible.builtin.file:
-    path: "{{ matrix_systemd_path }}/matrix-mautrix-wsproxy.service"
+    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-wsproxy.service"
     state: absent
   when: "matrix_mautrix_wsproxy_service_stat.stat.exists"
 
@@ -25,7 +25,7 @@
 
 - name: Check existence of matrix-mautrix-wsproxy-syncproxy service
   ansible.builtin.stat:
-    path: "{{ matrix_systemd_path }}/matrix-mautrix-wsproxy-syncproxy.service"
+    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-wsproxy-syncproxy.service"
   register: matrix_mautrix_wsproxy_syncproxy_service_stat
 
 - name: Ensure matrix-mautrix-wsproxy-syncproxy is stopped
@@ -37,7 +37,7 @@
 
 - name: Ensure matrix-mautrix-wsproxy-syncproxy.service doesn't exist
   ansible.builtin.file:
-    path: "{{ matrix_systemd_path }}/matrix-mautrix-wsproxy-syncproxy.service"
+    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-mautrix-wsproxy-syncproxy.service"
     state: absent
   when: "matrix_mautrix_wsproxy_syncproxy_service_stat.stat.exists"
 
diff --git a/roles/matrix-bridge-mautrix-wsproxy/tasks/validate_config.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/validate_config.yml
similarity index 100%
rename from roles/matrix-bridge-mautrix-wsproxy/tasks/validate_config.yml
rename to roles/custom/matrix-bridge-mautrix-wsproxy/tasks/validate_config.yml
diff --git a/roles/matrix-bridge-mautrix-wsproxy/templates/config.yaml.j2 b/roles/custom/matrix-bridge-mautrix-wsproxy/templates/config.yaml.j2
similarity index 100%
rename from roles/matrix-bridge-mautrix-wsproxy/templates/config.yaml.j2
rename to roles/custom/matrix-bridge-mautrix-wsproxy/templates/config.yaml.j2
diff --git a/roles/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy-syncproxy.service.j2 b/roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy-syncproxy.service.j2
similarity index 100%
rename from roles/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy-syncproxy.service.j2
rename to roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy-syncproxy.service.j2
diff --git a/roles/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy.service.j2 b/roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy.service.j2
similarity index 100%
rename from roles/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy.service.j2
rename to roles/custom/matrix-bridge-mautrix-wsproxy/templates/systemd/matrix-mautrix-wsproxy.service.j2