diff --git a/.kitchen.yml b/.kitchen.yml
index 97831fd..63d17e5 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -61,6 +61,13 @@ platforms:
     run_command: /sbin/init
     provision_command:
       - systemctl enable ssh.service
+- name: ubuntu1804-ansible-latest
+  driver:
+    image: rndmh3ro/docker-ubuntu1804-ansible:latest
+    platform: ubuntu
+    run_command: /sbin/init
+    provision_command:
+      - systemctl enable ssh.service
 - name: debian8-ansible-latest
   driver:
     image: rndmh3ro/docker-debian8-ansible:latest
diff --git a/.travis.yml b/.travis.yml
index 3102621..aa260db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,14 +20,19 @@ env:
 #    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 #    version: latest
 
+  - distro: ubuntu1404
+    version: latest
+    init: /sbin/init
+
   - distro: ubuntu1604
     version: latest
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
-  - distro: ubuntu1404
+  - distro: ubuntu1804
     version: latest
-    init: /sbin/init
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
   - distro: debian8
     version: latest
diff --git a/meta/main.yml b/meta/main.yml
index 7a8f1f0..0fdf309 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -15,10 +15,12 @@ galaxy_info:
         - precise
         - trusty
         - xenial
+        - bionic
     - name: Debian
       versions:
         - wheezy
         - jessie
+        - stretch
   galaxy_tags:
     - system
     - security