diff --git a/roles/nginx/templates/nginx_org_sources.list.j2 b/roles/nginx/templates/nginx_org_sources.list.j2
index 352a195..90aca09 100644
--- a/roles/nginx/templates/nginx_org_sources.list.j2
+++ b/roles/nginx/templates/nginx_org_sources.list.j2
@@ -1,14 +1,14 @@
 {{ ansible_managed | comment }}
 
 {% if ansible_distribution == 'Ubuntu' %}
+
 {% if nginx_version == "stable" %}
 deb [arch=amd64] https://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx
 {% elif nginx_version == "mainline" %}
 deb [arch=amd64] https://nginx.org/packages/mainline/ubuntu/ {{ ansible_distribution_release }} nginx
 {% endif %}
-{% endif %}
 
-{% if ansible_distribution == 'Debian' and ansible_distribution_release == 'buster' %}
+{% elif ansible_distribution == 'Debian' and ansible_distribution_release == 'buster' %}
 # there are no tarsnap packages for Debian 10 "buster" yet, so use Debian 9's
 {% if nginx_version == "stable" %}
 deb [arch=amd64] https://nginx.org/packages/debian/ stretch nginx
@@ -16,11 +16,11 @@ deb [arch=amd64] https://nginx.org/packages/debian/ stretch nginx
 deb [arch=amd64] https://nginx.org/packages/mainline/debian/ stretch nginx
 {% endif %}
 
-{# else, distribution is not Debian buster #}
-{% else %}
+{% elif ansible_distribution == 'Debian' and ansible_distribution_release != 'buster' %}
 {% if nginx_version == "stable" %}
 deb [arch=amd64] https://nginx.org/packages/debian/ {{ ansible_distribution_release }} nginx
 {% elif nginx_version == "mainline" %}
 deb [arch=amd64] https://nginx.org/packages/mainline/debian/ {{ ansible_distribution_release }} nginx
 {% endif %}
+
 {% endif %}