diff --git a/meta/main.yml b/meta/main.yml
index 26a35e5..15e5cd7 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -23,6 +23,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - bionic
         - xenial
   categories:
     - cloud
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu.yml
similarity index 100%
rename from vars/ubuntu-16.04.yml
rename to vars/ubuntu.yml
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 98bb643..9c993b8 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -16,8 +16,10 @@
     check:
       jobs:
         - openstack-ansible-linters
+        - openstack-ansible-functional-ubuntu-bionic
         - openstack-ansible-functional-ubuntu-xenial
     gate:
       jobs:
         - openstack-ansible-linters
+        - openstack-ansible-functional-ubuntu-bionic
         - openstack-ansible-functional-ubuntu-xenial