diff --git a/roles/debian/nginx/templates/drupal10.j2 b/roles/debian/nginx/templates/drupal10.j2
index 2bef01860..c74dc42d0 100644
--- a/roles/debian/nginx/templates/drupal10.j2
+++ b/roles/debian/nginx/templates/drupal10.j2
@@ -24,10 +24,10 @@ location @phpprocess {
 # Rewrite any request not whitelisted below,
 # so they get processed through the app level (and 404).
 location / {
-    {% if nginx.ratelimitingcrawlers %}
+{% if nginx.ratelimitingcrawlers %}
 #    @todo
 #    limit_req zone=bots burst=5 nodelay;
-    {% endif %}
+{% endif %}
     try_files @rewrite /index.php?$query_string;
 }
 
diff --git a/roles/debian/nginx/templates/drupal_common.j2 b/roles/debian/nginx/templates/drupal_common.j2
index e87a61702..8e3bf96f6 100644
--- a/roles/debian/nginx/templates/drupal_common.j2
+++ b/roles/debian/nginx/templates/drupal_common.j2
@@ -16,10 +16,10 @@ location @phpprocess {
 # Rewrite any request not whitelisted below,
 # so they get processed through the app level (and 404).
 location / {
-    {% if nginx.ratelimitingcrawlers %}
+{% if nginx.ratelimitingcrawlers %}
 #    @todo
 #    limit_req zone=bots burst=5 nodelay;
-    {% endif %}
+{% endif %}
     try_files @rewrite /index.php?$query_string;
 }
 
diff --git a/roles/debian/nginx/templates/nginx.conf.j2 b/roles/debian/nginx/templates/nginx.conf.j2
index f64cad774..7d608906e 100644
--- a/roles/debian/nginx/templates/nginx.conf.j2
+++ b/roles/debian/nginx/templates/nginx.conf.j2
@@ -54,9 +54,9 @@ http {
     ##
 
 {% if nginx.http.custom_directives is defined %}
-    {% for directive in nginx.http.custom_directives %}
+{% for directive in nginx.http.custom_directives %}
     {{ directive }}
-    {% endfor %}
+{% endfor %}
 {% endif %}
 
     ##
diff --git a/roles/debian/nginx/templates/vhosts.j2 b/roles/debian/nginx/templates/vhosts.j2
index 9cf7b514a..96546b61a 100644
--- a/roles/debian/nginx/templates/vhosts.j2
+++ b/roles/debian/nginx/templates/vhosts.j2
@@ -16,9 +16,9 @@ server {
     rewrite ^ https://{{ domain.server_name }}$request_uri? permanent;
 {% endif %}
 {% if server.custom_directives is defined %}
-    {% for directive in server.custom_directives %}
+{% for directive in server.custom_directives %}
     {{ directive }}
-    {% endfor %}
+{% endfor %}
 {% endif %}
 {% if server.ssl %}
     ssl_certificate {{ ssl_facts[_ssl_domains[0]].certificate }};
@@ -38,23 +38,32 @@ server {
     }
 {% endif %}
 {% endif %}
-{% if 
-    domain.basic_auth.auth_enabled is defined and
-    domain.basic_auth.auth_enabled and
-    domain.basic_auth.auth_user is defined and
-    domain.basic_auth.auth_user | length > 0
-%}
+
+{% if domain.basic_auth.auth_enabled is defined and domain.basic_auth.auth_enabled %}
+{% if _profile == 'asg' and domain.is_default is defined and domain.is_default %}
+    # Additional http_auth bypass for ASG healthchecks.
+    set $bypassagent "0";
+    set $bypass "0";
+    set $auth_status "{{ domain.basic_auth.auth_message | default('Restricted content') }}";
+    if ($http_user_agent ~* "ELB-HealthChecker") {
+        set $bypassagent "1";
+    }
+    if ($remote_addr ~ "^{{ _aws_vpc_cidr_base | replace('.', '\\.') }}\." ) {
+        set $bypass "${bypassagent}1";
+    }
+    if ($bypass = "11") {
+        set $auth_status "off";
+    }
+    auth_basic $auth_status;
+{% else %}
     auth_basic "{{ domain.basic_auth.auth_message | default('Restricted content') }}";
+{% endif %}
+{% if domain.basic_auth.auth_user is defined and domain.basic_auth.auth_user | length > 0 %}
     auth_basic_user_file "/etc/nginx/passwords/{{ domain.server_name }}.htpasswd";
 {% endif %}
-{% if 
-    domain.basic_auth.auth_enabled is defined and
-    domain.basic_auth.auth_enabled and
-    domain.basic_auth.auth_file is defined and
-    domain.basic_auth.auth_file | length > 0
-%}
-    auth_basic "{{ domain.basic_auth.auth_message | default('Restricted content') }}";
+{% if domain.basic_auth.auth_file is defined and domain.basic_auth.auth_file | length > 0 %}
     auth_basic_user_file "/etc/nginx/passwords/{{ domain.server_name }}.provided.htpasswd";
 {% endif %}
+{% endif %}
 }
 {% endfor %}