diff --git a/bin/convertdomain b/bin/convertdomain
index cdd83f2..6925726 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -534,6 +534,8 @@ convert_matrix() {
   # Insert our Postgres and LDAP config
 cat >> /federated/apps/matrix/data/matrix/homeserver.yaml <<EOF
 
+web_client_location: https://element.$DOMAIN_NEW/
+public_baseurl: https://matrix.$DOMAIN_NEW:443/
 serve_server_wellknown: true
 turn_uris: [ "turn:turn.$DOMAIN_NEW?transport=udp", "turn:turn.$DOMAIN_NEW?transport=tcp" ]
 turn_shared_secret: "$COTURN_MATRIX_SECRET"
diff --git a/lib/matrix.sh b/lib/matrix.sh
index 422a382..81ba4cb 100644
--- a/lib/matrix.sh
+++ b/lib/matrix.sh
@@ -64,6 +64,8 @@ sed -i 's!args:!!g' /federated/apps/matrix/data/matrix/homeserver.yaml
 # Insert our Postgres and LDAP config
 cat >> /federated/apps/matrix/data/matrix/homeserver.yaml <<EOF
 
+web_client_location: https://element.$DOMAIN/
+public_baseurl: https://matrix.$DOMAIN:443/
 serve_server_wellknown: true
 turn_uris: [ "turn:turn.$DOMAIN?transport=udp", "turn:turn.$DOMAIN?transport=tcp" ]
 turn_shared_secret: "$COTURN_MATRIX_SECRET"