diff --git a/swag/nginx/proxy-confs/element.subdomain.conf b/swag/nginx/proxy-confs/element.subdomain.conf
index 390da3a..469527d 100644
--- a/swag/nginx/proxy-confs/element.subdomain.conf
+++ b/swag/nginx/proxy-confs/element.subdomain.conf
@@ -11,7 +11,9 @@ server {
     server_name element.*;
 
     include /config/nginx/ssl.conf;
-    add_header X-Frame-Options "SAMEORIGIN" always;
+
+    # HSTS (ngx_http_headers_module is required) (63072000 seconds)
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
 
     client_max_body_size 0;
 
diff --git a/swag/nginx/proxy-confs/matrix-to.subdomain.conf b/swag/nginx/proxy-confs/matrix-to.subdomain.conf
index 1a21335..00b2f89 100644
--- a/swag/nginx/proxy-confs/matrix-to.subdomain.conf
+++ b/swag/nginx/proxy-confs/matrix-to.subdomain.conf
@@ -11,7 +11,9 @@ server {
     server_name invite.*;
 
     include /config/nginx/ssl.conf;
-    add_header X-Frame-Options "SAMEORIGIN" always;
+
+    # HSTS (ngx_http_headers_module is required) (63072000 seconds)
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
 
     client_max_body_size 0;
 
diff --git a/swag/nginx/proxy-confs/synapse.subdomain.conf b/swag/nginx/proxy-confs/synapse.subdomain.conf
index 89ee38b..1c32f38 100644
--- a/swag/nginx/proxy-confs/synapse.subdomain.conf
+++ b/swag/nginx/proxy-confs/synapse.subdomain.conf
@@ -12,6 +12,9 @@ server {
 
     include /config/nginx/ssl.conf;
 
+    # HSTS (ngx_http_headers_module is required) (63072000 seconds)
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
+
     client_max_body_size 0;
 
     # enable for ldap auth, fill in ldap details in ldap.conf
diff --git a/swag/nginx/ssl.conf b/swag/nginx/ssl.conf
index d11186d..2c1be2e 100644
--- a/swag/nginx/ssl.conf
+++ b/swag/nginx/ssl.conf
@@ -19,9 +19,6 @@ ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDS
 ssl_prefer_server_ciphers on;
 ssl_conf_command Options PrioritizeChaCha;
 
-# HSTS (ngx_http_headers_module is required) (63072000 seconds)
-add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
-
 # OCSP stapling
 ssl_stapling on;
 ssl_stapling_verify on;