diff --git a/roles/matrix/templates/apache2-vhost-ssl.conf b/roles/matrix/templates/apache2-vhost-ssl.conf
index 8de69a7..c2bbb19 100644
--- a/roles/matrix/templates/apache2-vhost-ssl.conf
+++ b/roles/matrix/templates/apache2-vhost-ssl.conf
@@ -11,7 +11,7 @@ SSLProxyEngine on
 	ServerName {{ matrix_url }}
 	Redirect permanent / https://{{ matrix_url }}
 </VirtualHost>
-<VirtualHost *:443>
+<VirtualHost *:443 *:8448>
 	SSLEngine on
 	SSLCertificateFile /etc/pki/cert/crt/{{ matrix_url }}.crt
 	SSLCertificateKeyFile /etc/pki/cert/private/{{ matrix_url }}.key
@@ -25,22 +25,9 @@ SSLProxyEngine on
 		AllowOverride All
 		Options MultiViews FollowSymlinks
 	</Directory>
-	RequestHeader set X_FORWARDED_PROTO 'https'
-	RequestHeader set X-Forwarded-Ssl on
-</VirtualHost>
-<VirtualHost *:8448>
-	SSLEngine on
-	SSLCertificateFile /etc/pki/cert/crt/{{ matrix_url }}.crt
-	SSLCertificateKeyFile /etc/pki/cert/private/{{ matrix_url }}.key
-	SSLCertificateChainFile /etc/pki/cert/crt/{{ matrix_url }}-fullchain.crt
-	SSLProtocol {{ ssl_protocol }}
-	SSLCipherSuite {{ ssl_cipher_suite }}
-	ServerName {{ matrix_url }}
-	ProxyPreserveHost On
-	ProxyRequests Off
-	ProxyPass / http://127.0.0.1:8008/ nocanon retry=1
-	ProxyPassReverse / https://127.0.0.1:8008/
-
+	AllowEncodedSlashes NoDecode
+	ProxyPass /_matrix http://127.0.0.1:8008/ nocanon retry=1
+	ProxyPassReverse /_matrix https://127.0.0.1:8008/
 	RequestHeader set X_FORWARDED_PROTO 'https'
 	RequestHeader set X-Forwarded-Ssl on
 </VirtualHost>