diff --git a/util/Setup/Templates/NginxConfig.hbs b/util/Setup/Templates/NginxConfig.hbs
index 8c4b954784..65493c0969 100644
--- a/util/Setup/Templates/NginxConfig.hbs
+++ b/util/Setup/Templates/NginxConfig.hbs
@@ -108,10 +108,6 @@ server {
     proxy_pass http://sso:5000/;
   }
 
-  location /portal/ {
-    proxy_pass http://portal:5000/;
-  }
-
   location /icons/ {
     proxy_pass http://icons:5000/;
   }
@@ -134,6 +130,15 @@ server {
     proxy_pass http://admin:5000;
 {{#if Ssl}}
     include /etc/nginx/security-headers-ssl.conf;
+{{/if}}
+    include /etc/nginx/security-headers.conf;
+    add_header X-Frame-Options SAMEORIGIN;
+  }
+
+  location /portal {
+    proxy_pass http://portal:5000;
+{{#if Ssl}}
+    include /etc/nginx/security-headers-ssl.conf;
 {{/if}}
     include /etc/nginx/security-headers.conf;
     add_header X-Frame-Options SAMEORIGIN;