diff --git a/nginx.conf.tmpl b/nginx.conf.tmpl
index befb5a7..f0e8219 100644
--- a/nginx.conf.tmpl
+++ b/nginx.conf.tmpl
@@ -67,8 +67,7 @@ http {
         add_header X-XSS-Protection                     "1; mode=block" always;
 
         {{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}
-        add_header X-Frame-Options                      "{{ env "X_FRAME_OPTIONS_ALLOW_FROM" }}"    always;
-        add_header Content-Security-Policy              "frame-ancestors {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }}";
+        add_header Content-Security-Policy              "frame-ancestors {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} {{ env "DOMAIN" }}";
         {{ else }}
         add_header X-Frame-Options                      "SAMEORIGIN"    always;
         {{ end }}