diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index 02918cb..d02c38f 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Add GPG key for MariaDB repo
-  apt_key: id=0xcbcb082a1bb943db url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xcbcb082a1bb943db
+  apt_key: id=0xF1656F24C74CD1D8 url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xF1656F24C74CD1D8
   tags: mariadb, packages
 
 - name: Remove old repo file
diff --git a/roles/mariadb/templates/mariadb.list.j2 b/roles/mariadb/templates/mariadb.list.j2
index 36fbfd5..7ae37c7 100644
--- a/roles/mariadb/templates/mariadb.list.j2
+++ b/roles/mariadb/templates/mariadb.list.j2
@@ -1,8 +1,7 @@
 # {{ ansible_managed }}
-{% if ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04' %}
+{% if ansible_distribution == 'Ubuntu' %}
 
-# there are no xenial builds yet, so use wily
-deb [arch=amd64,i386] http://mariadb.mirror.serveriai.lt/repo/10.1/ubuntu wily main
+deb [arch=amd64,i386] http://mariadb.mirror.serveriai.lt/repo/10.1/ubuntu {{ ansible_distribution_release }} main
 
 {% elif ansible_distribution == 'Debian' %}