diff --git a/roles/common/templates/tarsnap_sources.list.j2 b/roles/common/templates/tarsnap_sources.list.j2
index 824dbc8..94cbce3 100644
--- a/roles/common/templates/tarsnap_sources.list.j2
+++ b/roles/common/templates/tarsnap_sources.list.j2
@@ -1,4 +1,4 @@
-{% if ansible_distribution_release == 'bionic' %}
+{% if ansible_distribution_version | version_compare('18.04', '==') %}
 # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful"
 deb https://pkg.tarsnap.com/deb/artful ./
 {% else %}
diff --git a/roles/mariadb/templates/mariadb.list.j2 b/roles/mariadb/templates/mariadb.list.j2
index 209d3bc..bfbc8dd 100644
--- a/roles/mariadb/templates/mariadb.list.j2
+++ b/roles/mariadb/templates/mariadb.list.j2
@@ -1,7 +1,7 @@
 # {{ ansible_managed }}
 {% if ansible_distribution == 'Ubuntu' %}
 
-{% if ansible_distribution_release == 'bionic' %}
+{% if ansible_distribution_version | version_compare('18.04', '==') %}
 # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful"
 deb [arch=amd64,i386] http://mariadb.mirror.serveriai.lt/repo/10.2/ubuntu artful main
 {% else %}
diff --git a/roles/nginx/templates/nginx_org_sources.list.j2 b/roles/nginx/templates/nginx_org_sources.list.j2
index ca10562..edbfe7f 100644
--- a/roles/nginx/templates/nginx_org_sources.list.j2
+++ b/roles/nginx/templates/nginx_org_sources.list.j2
@@ -2,14 +2,14 @@
 
 {% if ansible_distribution == 'Ubuntu' %}
 {% if nginx_version == "stable" %}
-{% if ansible_distribution_release == 'bionic' %}
+{% if ansible_distribution_version | version_compare('18.04', '==') %}
 # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful"
 deb https://nginx.org/packages/ubuntu/ artful nginx
 {% else %}
 deb https://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx
 {% endif %}
 {% elif nginx_version == "mainline" %}
-{% if ansible_distribution_release == 'bionic' %}
+{% if ansible_distribution_version | version_compare('18.04', '==') %}
 # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful"
 deb https://nginx.org/packages/mainline/ubuntu/ artful nginx
 {% else %}