diff --git a/templates/etc/nginx/sites-available/base.j2 b/templates/etc/nginx/sites-available/base.j2
index 50cf514..0f6d287 100644
--- a/templates/etc/nginx/sites-available/base.j2
+++ b/templates/etc/nginx/sites-available/base.j2
@@ -8,10 +8,10 @@
 {% block location %}
   location / {
     try_files {{ item.override_try_files | default('$uri $uri/ =404') }};
+  }
 {% endblock %}
 {% block app_root_location %}
 {% endblock %}
-  }
 
 {% block extra_locations %}
 {% endblock %}
diff --git a/templates/etc/nginx/sites-available/core.j2 b/templates/etc/nginx/sites-available/core.j2
index 17a05d7..3fc1314 100644
--- a/templates/etc/nginx/sites-available/core.j2
+++ b/templates/etc/nginx/sites-available/core.j2
@@ -8,7 +8,7 @@
 
 {% block server_info %}
 ## SERVER INFO
-server {  
+server {
   server_name {% if item.name is string %}{{ item.name }}{% else %}{{ item.name | join(' ') }}{% endif %};
 {% if item.proto == 'http' %}
   listen {{ item.listen }} {% if nginx_default_vhost == item.name %} default_server{% endif %};
@@ -49,6 +49,10 @@ server {
 {% if item.headers is defined and item.headers == 'none' %}
 {% else %}
 ## HEADERS
+{% if item.permission_policy is defined and item.permission_policy == 'none' %}
+{% else %}
+  add_header Permissions-Policy "geolocation=(),interest-cohort=()";
+{% endif %}
 {% if item.secure_site is defined %}
   add_header X-Download-Options noopen;
   add_header X-Permitted-Cross-Domain-Policies none;
@@ -83,7 +87,10 @@ server {
   add_header X-XSS-Protection "1; mode=block";
 {% endif %}
 {% if item.robots is defined %}
+{% if item.robots == 'none' %}
+{% else %}
   add_header X-Robots-Tag "{{ item.robots }}";
+{% endif %}
 {% else %}
   add_header X-Robots-Tag none;
 {% endif %}