diff --git a/.kitchen.vagrant.yml b/.kitchen.vagrant.yml
index abfbd20..6e0b675 100644
--- a/.kitchen.vagrant.yml
+++ b/.kitchen.vagrant.yml
@@ -9,7 +9,7 @@ transport:
 
 provisioner:
   name: ansible_playbook
-  roles_path: ../../roles
+  roles_path: ../
   hosts: test-kitchen
 #  ansible_verbose: true
   ansible_verbose: false
@@ -17,6 +17,7 @@ provisioner:
   ansible_extra_flags: <%= ENV['ANSIBLE_EXTRA_FLAGS'] %>
 
 platforms:
+  - name: ubuntu-18.04
   - name: ubuntu-16.04
   - name: ubuntu-14.04
   - name: ubuntu-12.04
diff --git a/.kitchen.yml b/.kitchen.yml
index 65c6b0f..8b4bfea 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -13,7 +13,6 @@ provisioner:
   ansible_verbose: false
   ansible_verbosity: 3
   ansible_extra_flags: <%= ENV['ANSIBLE_EXTRA_FLAGS'] %>
-#  ansible_yum_repo: http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-8.noarch.rpm
   require_chef_omnibus: false
   require_ansible_omnibus: true
 #  require_chef_for_busser: false
@@ -21,6 +20,7 @@ provisioner:
   ansible_connection: ssh
 
 platforms:
+  - name: ubuntu-18.04
   - name: ubuntu-16.04
 ## FIXME! test frozing/stalling on '-----> Running bats test suite' for trusty and precise???
 #  - name: ubuntu-14.04
diff --git a/.travis.yml b/.travis.yml
index ec2e966..ede8fe6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,12 +10,15 @@ env:
   - distribution: centos
     version: 7
     init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
+  - distribution: ubuntu
+    version: 18.04
+    init: /lib/systemd/systemd
+    run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
   - distribution: ubuntu
     version: 16.04
     init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-#    run_opts: "--cap-add SYS_ADMIN"
+    run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
 ## FIXME! travis/trusty build stalling
 #  - distribution: ubuntu
 #    version: 14.04
diff --git a/.travis.yml.docker b/.travis.yml.docker
index 5bb7622..7395d16 100644
--- a/.travis.yml.docker
+++ b/.travis.yml.docker
@@ -11,11 +11,14 @@ env:
     version: 7
     init: /usr/lib/systemd/systemd
     run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
+  - distribution: ubuntu
+    version: 18.04
+    init: /lib/systemd/systemd
+    run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
   - distribution: ubuntu
     version: 16.04
     init: /lib/systemd/systemd
     run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
-#    run_opts: "--cap-add SYS_ADMIN"
   - distribution: ubuntu
     version: 14.04
     init: /sbin/init
diff --git a/.travis.yml.lxd b/.travis.yml.lxd
index fbfa652..c7cdeeb 100644
--- a/.travis.yml.lxd
+++ b/.travis.yml.lxd
@@ -10,6 +10,8 @@ env:
 #    version: 6
 #  - distribution: centos
 #    version: 7
+  - distribution: ubuntu
+    version: 18.04
   - distribution: ubuntu
     version: 16.04
   - distribution: ubuntu
diff --git a/.travis.yml.lxd-kitchen b/.travis.yml.lxd-kitchen
index 8a89296..5d862a7 100644
--- a/.travis.yml.lxd-kitchen
+++ b/.travis.yml.lxd-kitchen
@@ -10,6 +10,8 @@ env:
 #    version: 6
 #  - distribution: centos
 #    version: 7
+  - distribution: ubuntu
+    version: 18.04
   - distribution: ubuntu
     version: 16.04
   - distribution: ubuntu
@@ -47,20 +49,12 @@ before_install:
   - sudo service lxd restart
 
   - sudo pip install ansible
-## need to use chef gem for some reason? BAD PATH https://github.com/chef/chef-dk/issues/15
-#  - chef gem install kitchen
   - gem install kitchen
   - gem install kitchen-ansible
   - gem install kitchen-sync
   - gem install kitchen-lxd_cli
-## Message: Unable to activate kitchen-ansible-0.45.0, because net-ssh-2.9.2 conflicts with net-ssh (~> 3.0)
-#  - chef gem uninstall net-ssh -v 2.9.2 -q ?-y
-#  - chef gem list
   - gem list
   - which kitchen
-#  - which chef
-#  - find /var/lib/gems $HOME/.gem /usr/local/rvm/gems /opt/chefdk/embedded/lib/ruby/gem -iname '*lxd_cli*' || true
-  - wget -q https://releases.hashicorp.com/vagrant/1.9.7/vagrant_1.9.7_x86_64.deb && sudo dpkg -i vagrant_1.9.7_x86_64.deb
 ## ssh key for lxd_cli ?
   - ls ~/.ssh
   - ssh-keygen -t rsa -b 2048 -f ~/.ssh/id_rsa -P ""
diff --git a/README.md b/README.md
index 3e02ed9..cc20cd1 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,11 @@ It was tested on the following versions:
  * 1.9
  * 2.0
  * 2.2
+ * 2.5
 
 ### Operating systems
 
-Ubuntu 14.04, 16.04 and Centos 7
+Ubuntu 14.04, 16.04, 18.04 and Centos 7
 
 ## Example Playbook
 
diff --git a/meta/main.yml b/meta/main.yml
index 7a2f5f0..dcc633c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -19,6 +19,7 @@ galaxy_info:
     - precise
     - trusty
     - xenial
+    - bionic
   #
   # Below are all categories currently available. Just as with
   # the platforms above, uncomment those that apply to your role.
diff --git a/test/travis/Dockerfile.ubuntu-18.04 b/test/travis/Dockerfile.ubuntu-18.04
new file mode 100644
index 0000000..585a268
--- /dev/null
+++ b/test/travis/Dockerfile.ubuntu-18.04
@@ -0,0 +1,11 @@
+FROM ubuntu:18.04
+RUN apt-get update
+
+# Install Ansible
+RUN env DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common git systemd
+RUN apt-get update
+RUN apt-get install -y python sudo python-pip python-dev libffi-dev ansible
+
+# Install Ansible inventory file
+#RUN mkdir /etc/ansible
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/vars/Ubuntu-18.04.yml b/vars/Ubuntu-18.04.yml
new file mode 100644
index 0000000..91c7f20
--- /dev/null
+++ b/vars/Ubuntu-18.04.yml
@@ -0,0 +1,7 @@
+---
+
+fprobe_pkg:
+  - fprobe
+
+fprobe_svc: fprobe
+