diff --git a/roles/nginx/templates/nginx_org_sources.list.j2 b/roles/nginx/templates/nginx_org_sources.list.j2
index 46405bf..092e694 100644
--- a/roles/nginx/templates/nginx_org_sources.list.j2
+++ b/roles/nginx/templates/nginx_org_sources.list.j2
@@ -6,12 +6,13 @@ deb http://nginx.org/packages/mainline/ubuntu/ {{ ansible_distribution_release }
 {% endif %}
 {% endif %}
 
-{% if ansible_distribution_version == '15.04' %}
-# There are no nginx.org builds for Ubuntu 15.04 (vivid) yet, so use 14.10 (utopic)
+{% if ansible_distribution_version == '16.04' %}
+# There are no nginx.org builds for Ubuntu 16.04 (xenial) yet, so use 15.10 (wily)
 {% if nginx_version == "stable" %}
-deb http://nginx.org/packages/ubuntu/ utopic nginx
+deb http://nginx.org/packages/ubuntu/ wily nginx
 {% elif nginx_version == "mainline" %}
-deb http://nginx.org/packages/mainline/ubuntu/ utopic nginx
+# There are no "mainline" nginx.org builds for Ubuntu 16.04 (xenial) yet, so use 15.10 (wily)
+deb http://nginx.org/packages/mainline/ubuntu/ wily nginx
 {% endif %}
 {% endif %}