diff --git a/roles/matrix-ldap-registration-proxy/defaults/main.yml b/roles/matrix-ldap-registration-proxy/defaults/main.yml
index 469a2f295..712e1101d 100644
--- a/roles/matrix-ldap-registration-proxy/defaults/main.yml
+++ b/roles/matrix-ldap-registration-proxy/defaults/main.yml
@@ -30,6 +30,10 @@ matrix_ldap_registration_proxy_container_port: 8080
 # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:8080"), or empty string to not expose.
 matrix_ldap_registration_proxy_container_http_host_bind_port: ''
 
+matrix_ldap_registration_proxy_registration_addr_with_container: "matrix-ldap_-egistration-proxy:{{ matrix_ldap_registration_proxy_container_port }}"
+matrix_ldap_registration_proxy_registration_addr_sans_container: "127.0.0.1:{{ matrix_ldap_registration_proxy_container_port }}"
+
+
 # A list of extra arguments to pass to the container
 matrix_ldap_registration_proxy_container_extra_arguments: []
 
diff --git a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
index 2895ba14a..0e16e3e31 100644
--- a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
+++ b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
@@ -129,6 +129,20 @@
 	}
 	{% endif %}
 
+    {% if matrix_ldap_registration_proxy_enabled %}
+        location _matrix/client/r0/register {
+            {% if matrix_nginx_proxy_enabled %}
+                {# Use the embedded DNS resolver in Docker containers to discover the service #}
+                resolver 127.0.0.11 valid=5s;
+                set $backend "{{ matrix_nginx_proxy_proxy_matrix_3pid_registration_addr_with_container }}";
+                proxy_pass http://$backend/register;
+            {% else %}
+                {# Generic configuration for use outside of our container setup #}
+                proxy_pass http://{{ matrix_nginx_proxy_proxy_matrix_3pid_registration_addr_sans_container }}/register;
+            {% endif %}
+        }
+    {% endif %}
+
 	{% for configuration_block in matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks %}
 		{{- configuration_block }}
 	{% endfor %}