diff --git a/examples/caddy/matrix-dimension b/examples/caddy/matrix-dimension
index 82f12c01a..74d08e593 100644
--- a/examples/caddy/matrix-dimension
+++ b/examples/caddy/matrix-dimension
@@ -3,7 +3,7 @@ https://dimension.DOMAIN {
 	# If you wish to use Caddy's built-in Let's Encrypt support, you can also supply an email address here
 	tls /matrix/ssl/config/live/dimension.DOMAIN/fullchain.pem /matrix/ssl/config/live/dimension.DOMAIN/privkey.pem
 
-	proxy / http://127.0.0.1:8134/ {
+	proxy / http://127.0.0.1:8184/ {
 		transparent
 	}
 }
diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index aa2d0b75a..24646e772 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -319,6 +319,9 @@ matrix_dimension_enabled: false
 # the Dimension HTTP port to the local host.
 matrix_dimension_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:8184' }}"
 
+matrix_integration_manager_rest_url: "{{ matrix_dimension_integrations_rest_url if matrix_dimension_enabled else None }}"
+matrix_integration_manager_ui_url: "{{ matrix_dimension_integrations_ui_url if matrix_dimension_enabled else None }}"
+
 ######################################################################
 #
 # /matrix-dimension
diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index 9ffffc2fa..b4fef1dd7 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -31,6 +31,9 @@ matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
 
 matrix_identity_server_url: ~
 
+matrix_integration_manager_rest_url: ~
+matrix_integration_manager_ui_url: ~
+
 # The Docker network that all services would be put into
 matrix_docker_network: "matrix"
 
diff --git a/roles/matrix-base/templates/static-files/well-known/matrix-client.j2 b/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
index 4e93c2d8d..719656a4a 100644
--- a/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
+++ b/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
@@ -8,4 +8,14 @@
 		"base_url": "{{ matrix_identity_server_url }}"
 	}
 	{% endif %}
+	{% if matrix_integration_manager_rest_url and matrix_integration_manager_ui_url %},
+	"m.integrations": {
+		"managers": [
+			{
+				"api_url": "{{ matrix_integration_manager_rest_url }}",
+				"ui_url": "{{ matrix_integration_manager_ui_url }}"
+			}
+		]
+	}
+	{% endif %}
 }