diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 412cf54..19e90d4 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -78,12 +78,22 @@ http {
 
         root /var/empty;
 
-        return 301 https://matrix.grapheneos.org$request_uri;
+        return 301 https://$host$request_uri;
     }
 
     server {
         listen 443 ssl http2 backlog=4096;
         listen [::]:443 ssl http2 backlog=4096;
+        server_name element.grapheneos.org;
+
+        root /usr/share/webapps/element;
+
+        include snippets/security-headers.conf;
+    }
+
+    server {
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
         server_name matrix.grapheneos.org;
 
         root /var/empty;