diff --git a/.travis.yml b/.travis.yml
index 2f67452..f7a4e81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 sudo: required
-dist: trusty
+dist: xenial
 
 language: python
 python: "2.7"
@@ -93,7 +93,7 @@ script:
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  - if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml || true; fi
+  - if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml; fi
 
 notifications:
   email: false
diff --git a/meta/main.yml b/meta/main.yml
index a9da9af..281fae8 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -20,5 +20,5 @@ galaxy_info:
   galaxy_tags:
     - system
     - database
-    - database:sql
+    - sql
 dependencies: []
diff --git a/tasks/install.yml b/tasks/install.yml
index 794c67f..7485e1a 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -2,16 +2,14 @@
 ---
 - name: install | dependencies
   apt:
-    name: "{{ item }}"
+    name: "{{ percona_client_dependencies }}"
     state: "{{ apt_install_state | default('latest') }}"
-  with_items: "{{ percona_client_dependencies }}"
   tags:
     - percona-client-install-dependencies
 
 - name: install | additional
   apt:
-    name: "{{ item }}"
+    name: "{{ percona_client_install }}"
     state: "{{ apt_install_state | default('latest') }}"
-  with_items: "{{ percona_client_install }}"
   tags:
     - percona-client-install-additional