diff --git a/tasks/main.yml b/tasks/main.yml
index 0524581..766c42f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -12,11 +12,10 @@
 - name: install packages, jessie
   tags: apt
   apt:
-    name: "{{ item }}"
+    name:
+      - mysql-server
+      - mysql-client
     state: present
-  with_items:
-    - mysql-server
-    - mysql-client
   when:
     - ansible_distribution == "Debian"
     - ansible_distribution_major_version == "8"
@@ -24,14 +23,13 @@
 - name: install packages, stretch+
   tags: apt
   apt:
-    name: "{{ item }}"
+    name:
+      - mariadb-server
+      - mariadb-client
     state: present
-  with_items:
-    - mariadb-server
-    - mariadb-client
   when:
-    - ansible_distribution == "Debian"
-    - ansible_distribution_major_version|int() >= 9
+    - (ansible_distribution == "Debian" and ansible_distribution_major_version|int() >= 9) or
+      (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int() >= 20)
 
 
 - name: mysql conf