diff --git a/.zuul.yaml b/.zuul.yaml
index fc56be3e7..f7729a1e0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -579,6 +579,29 @@
       - ^test-requirements.txt$
       - ^LICENSE$
       - ^.gitignore$
+    vars:
+      nodepool_type: centos7
+
+- job:
+    name: puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
+    parent: puppet-openstack-integration-base
+    pre-run: playbooks/prepare-node-beaker.yaml
+    post-run: playbooks/upload-logs.yaml
+    run: playbooks/run-libraries-beaker-tests.yaml
+    timeout: 3600
+    nodeset: ubuntu-bionic
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^LICENSE$
+      - ^.gitignore$
+    vars:
+      nodepool_type: bionic
 
 - job:
     name: puppet-openstack-libraries-puppet-lint-centos-7
@@ -703,6 +726,7 @@
         - puppet-openstack-libraries-puppet-unit-4.8-centos-7
         - puppet-openstack-libraries-puppet-unit-latest-centos-7
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
+        - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
     gate:
       jobs:
         - puppet-openstack-libraries-puppet-lint-centos-7
@@ -711,3 +735,4 @@
         - puppet-openstack-libraries-puppet-unit-4.8-centos-7
         - puppet-openstack-libraries-puppet-unit-latest-centos-7
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
+        - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
diff --git a/configure_facts.sh b/configure_facts.sh
index 1ebc68299..96e44a984 100644
--- a/configure_facts.sh
+++ b/configure_facts.sh
@@ -17,7 +17,7 @@
 export WRITE_FACTS=${WRITE_FACTS:-true}
 export DLRN_BASE=${DLRN_BASE:-centos7-master/puppet-passed-ci}
 export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-centos7-master/deps/latest/}
-export CEPH_VERSION=${CEPH_VERSION:-luminous}
+export CEPH_VERSION=${CEPH_VERSION:-mimic}
 
 export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
 source $SCRIPT_DIR/functions
diff --git a/manifests/repos.pp b/manifests/repos.pp
index f1591cf27..97484e94d 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -4,7 +4,7 @@ class openstack_integration::repos {
   if $::ceph_version != '' {
     $ceph_version_real = $::ceph_version
   } else {
-    $ceph_version_real = 'luminous'
+    $ceph_version_real = 'mimic'
   }
   case $::osfamily {
     'Debian': {
diff --git a/playbooks/prepare-node-common.yaml b/playbooks/prepare-node-common.yaml
index 3f012db42..a7d5711fd 100644
--- a/playbooks/prepare-node-common.yaml
+++ b/playbooks/prepare-node-common.yaml
@@ -121,10 +121,10 @@
               export YUM=yum
           fi
           if [[ -f /usr/bin/yum || -f /usr/bin/dnf ]]; then
-              $YUM install -y https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm
+              $YUM install -y https://yum.puppetlabs.com/puppet5/puppet5-release-el-7.noarch.rpm
               $YUM install -y puppet-agent
           elif [ -f /usr/bin/apt-get ]; then
-              wget https://apt.puppetlabs.com/puppetlabs-release-pc1-{{ ansible_distribution_release }}.deb -O /tmp/puppet.deb
+              wget https://apt.puppetlabs.com/puppet5-release-{{ ansible_distribution_release }}.deb -O /tmp/puppet.deb
               dpkg -i /tmp/puppet.deb
               apt-get update
               apt-get install puppet-agent
diff --git a/playbooks/run-beaker-tests.yaml b/playbooks/run-beaker-tests.yaml
index 685ee9238..c5a818201 100644
--- a/playbooks/run-beaker-tests.yaml
+++ b/playbooks/run-beaker-tests.yaml
@@ -25,6 +25,7 @@
       shell:
         cmd: |
           trap "{{ ansible_user_dir }}/workspace/openstack/puppet-openstack-integration/copy_logs.sh" EXIT
+          export BEAKER_PUPPET_COLLECTION=puppet5
           export BEAKER_set=nodepool-{{ nodepool_type }}
           export BEAKER_debug=yes
           export BEAKER_color=no
diff --git a/playbooks/run-libraries-beaker-tests.yaml b/playbooks/run-libraries-beaker-tests.yaml
index d38382b3e..ea458a59c 100644
--- a/playbooks/run-libraries-beaker-tests.yaml
+++ b/playbooks/run-libraries-beaker-tests.yaml
@@ -25,6 +25,8 @@
           set -e
           set -x
           trap "{{ ansible_user_dir }}/workspace/openstack/puppet-openstack-integration/copy_logs.sh" EXIT
+          export BEAKER_PUPPET_COLLECTION=puppet5
+          export BEAKER_set=nodepool-{{ nodepool_type }}
           ./run_beaker_tests.sh
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
diff --git a/run_tests.sh b/run_tests.sh
index e4838cf49..cfadd33df 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -18,7 +18,7 @@ source ${SCRIPT_DIR}/functions
 
 export WORKSPACE=${WORKSPACE:-/tmp}
 export PUPPET_URL_SUFFIX=
-export CEPH_VERSION=${CEPH_VERSION:-luminous}
+export CEPH_VERSION=${CEPH_VERSION:-mimic}
 export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-4}
 export SCENARIO=${SCENARIO:-scenario001}
 export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}