diff --git a/meta/main.yml b/meta/main.yml
index c5eff6f..e0ebce6 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -22,6 +22,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - bionic
         - xenial
     - name: EL
       versions:
diff --git a/tasks/galera_client_install_apt.yml b/tasks/galera_client_install_apt.yml
index aa8bef4..909c612 100644
--- a/tasks/galera_client_install_apt.yml
+++ b/tasks/galera_client_install_apt.yml
@@ -55,6 +55,13 @@
       tags:
         - galera-client-apt-keys
 
+- name: Ensure the sources.list.d folder exists
+  file:
+    path: "/etc/apt/sources.list.d/"
+    state: directory
+  tags:
+    - galera-client-repos
+
 # TODO: Remove the following two tasks in Pike
 # They're only required during upgrades transitioning to a
 # statically named apt sources file.
diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
new file mode 100644
index 0000000..764a5a7
--- /dev/null
+++ b/vars/ubuntu-18.04.yml
@@ -0,0 +1,44 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Repositories
+# TODO(odyssey4me):
+# The use of 'galera_client_apt_repo_url' below is for backwards compatibility
+# to settings released in Newton. It can be removed in Queens.
+_galera_client_repo_url: "{{ galera_client_apt_repo_url | default('http://downloads.mariadb.com/MariaDB/mariadb-' ~ galera_client_major_version ~ '.' ~ galera_client_minor_version ~ '/repo/ubuntu') }}"
+# Temporarily replace {{ ansible_distribution_release }} with artful, as bionic
+# support is not provided yet
+#_galera_client_repo: "deb {{ galera_client_repo_url }} {{ ansible_distribution_release }} main"
+_galera_client_repo: "deb {{ galera_client_repo_url }} artful main"
+
+galera_client_distro_packages:
+  - build-essential
+  - libaio1
+  - libc6
+  - libgcc1
+  - libgcrypt20
+  - libmariadbclient-dev
+  - libssl-dev
+  - libstdc++6
+  - mariadb-client
+  - "mariadb-client-core-{{ galera_client_major_version }}"
+  - python-dev
+
+# Galera GPG Keys
+_galera_client_gpg_keys:
+  - key_name: 'mariadb'
+    keyserver: 'hkp://keyserver.ubuntu.com:80'
+    fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'
+    hash_id: '0xF1656F24C74CD1D8'
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 609cecd..09263db 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -18,6 +18,7 @@
         - openstack-ansible-linters
         - openstack-ansible-functional-centos-7
         - openstack-ansible-functional-opensuse-423
+        - openstack-ansible-functional-ubuntu-bionic
         - openstack-ansible-functional-ubuntu-xenial
         - openstack-ansible-ssl-galera_server-opensuse-423
         - openstack-ansible-ssl-galera_server-ubuntu-xenial
@@ -31,4 +32,5 @@
         - openstack-ansible-linters
         - openstack-ansible-functional-centos-7
         - openstack-ansible-functional-opensuse-423
+        - openstack-ansible-functional-ubuntu-bionic
         - openstack-ansible-functional-ubuntu-xenial