diff --git a/roles/fedora-web/fedora.im/files/matrix.conf b/roles/fedora-web/fedora.im/files/matrix.conf
index 29e8b5f870..cc19d64dae 100644
--- a/roles/fedora-web/fedora.im/files/matrix.conf
+++ b/roles/fedora-web/fedora.im/files/matrix.conf
@@ -1,5 +1,9 @@
 DocumentRoot /srv/web/fedora.im/
 
+<IfModule mod_headers.c>
+   Header add 'Access-Control-Allow-Origin: *'
+</IfModule>
+
 RewriteEngine On
 RewriteRule "^/.well-known/matrix/(.*)" "/srv/web/fedora.im/.well-known-matrix-$1-fedora-im" [L]
 RewriteRule (.*) https://getfedora.org [NE]
diff --git a/roles/fedora-web/main/files/matrix.conf b/roles/fedora-web/main/files/matrix.conf
index cd1c9c86eb..7b8c929b27 100644
--- a/roles/fedora-web/main/files/matrix.conf
+++ b/roles/fedora-web/main/files/matrix.conf
@@ -1,2 +1,8 @@
+<LocationMatch "/srv/web/.well-known-matrix*"
+<IfModule mod_headers.c>
+   Header add 'Access-Control-Allow-Origin: *'
+</IfModule>
+</Location>
+
 RewriteEngine On
 RewriteRule "^/.well-known/matrix/(.*)" "/srv/web/.well-known-matrix-$1-fedoraproject-org" [L]