diff --git a/.travis.yml b/.travis.yml
index 908dbf0..a849c2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,10 @@ python: "2.7"
 
 env:
   - ANSIBLE_VERSION=latest
+  - ANSIBLE_VERSION=2.7.2
   - ANSIBLE_VERSION=2.7.1
   - ANSIBLE_VERSION=2.7.0
+  - ANSIBLE_VERSION=2.6.8
   - ANSIBLE_VERSION=2.6.7
   - ANSIBLE_VERSION=2.6.6
   - ANSIBLE_VERSION=2.6.5
@@ -70,7 +72,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/Vagrantfile b/Vagrantfile
index 640b861..64d2358 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,6 +3,7 @@
 
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
+
 boxes = [
   {
     :name => "ubuntu-1204",
@@ -25,17 +26,31 @@ boxes = [
     :cpu => "50",
     :ram => "256"
   },
+  {
+    :name => "ubuntu-1804",
+    :box => "bento/ubuntu-18.04",
+    :ip => '10.0.0.14',
+    :cpu => "50",
+    :ram => "256"
+  },
   {
     :name => "debian-7",
     :box => "bento/debian-7",
-    :ip => '10.0.0.14',
+    :ip => '10.0.0.15',
     :cpu => "50",
     :ram => "256"
   },
   {
     :name => "debian-8",
     :box => "bento/debian-8",
-    :ip => '10.0.0.15',
+    :ip => '10.0.0.16',
+    :cpu => "50",
+    :ram => "256"
+  },
+  {
+    :name => "debian-9",
+    :box => "bento/debian-9",
+    :ip => '10.0.0.17',
     :cpu => "50",
     :ram => "256"
   },
diff --git a/handlers/main.yml b/handlers/main.yml
index 9b8bcb2..06b7fee 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,4 +1,5 @@
 # handlers file for ca-certificates
 ---
 - name: update ca-certificates
-  command: update-ca-certificates
+  command: >
+    update-ca-certificates
diff --git a/meta/main.yml b/meta/main.yml
index 7b06067..996e7f1 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,6 +1,7 @@
 # meta file for ca-certificates
 ---
 galaxy_info:
+  role_name: ca-certificates
   author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Manage ca-certificates in Debian-like systems
@@ -12,10 +13,12 @@ galaxy_info:
         - precise
         - trusty
         - xenial
+        - bionic
     - name: Debian
       versions:
         - wheezy
         - jessie
+        - stretch
   galaxy_tags:
     - system
     - certificates
diff --git a/tasks/main.yml b/tasks/main.yml
index ccf435e..024eb1b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,11 +2,10 @@
 ---
 - name: install dependencies
   apt:
-    name: "{{ item }}"
+    name: "{{ ca_certificates_dependencies }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
     cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
-  with_items: "{{ ca_certificates_dependencies }}"
   tags:
     - configuration
     - ca-certificates
@@ -16,7 +15,7 @@
 - name: stat directories
   stat:
     path: "{{ ca_certificates_base_dir }}/{{ item.dest | dirname }}"
-  register: stat_directories
+  register: _stat_directories
   with_items: "{{ ca_certificates_certificate_map }}"
   tags:
     - configuration
@@ -31,7 +30,7 @@
     owner: root
     group: root
     mode: 0755
-  with_items: "{{ stat_directories.results | default([]) }}"
+  with_items: "{{ _stat_directories.results | default([]) }}"
   when: item.stat.exists == false
   tags:
     - configuration