diff --git a/Vagrantfile b/Vagrantfile
index 888020d..e40e1cf 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-    config.vm.box = "generic/ubuntu1604"
+    config.vm.box = "generic/ubuntu1804"
 
     [:virtualbox, :parallels, :libvirt, :hyperv].each do |provider|
         config.vm.provider provider do |vplh, override|
diff --git a/divingbell/values.yaml b/divingbell/values.yaml
index d00f8bf..3990b5b 100644
--- a/divingbell/values.yaml
+++ b/divingbell/values.yaml
@@ -18,7 +18,7 @@
 # name: value
 
 images:
-  divingbell: 'ubuntu:16.04'
+  divingbell: 'ubuntu:18.04'
   pull_policy: IfNotPresent
 
 conf:
diff --git a/tools/gate/scripts/020-test-divingbell.sh b/tools/gate/scripts/020-test-divingbell.sh
index 6cf3d7c..d93f869 100755
--- a/tools/gate/scripts/020-test-divingbell.sh
+++ b/tools/gate/scripts/020-test-divingbell.sh
@@ -97,7 +97,7 @@ build_all_packages_yaml(){
   set -x
 }
 APT_REPOSITORY1="http://us.archive.ubuntu.com/ubuntu/"
-APT_DISTRIBUTIONS1="[ xenial ]"
+APT_DISTRIBUTIONS1="[ bionic ]"
 APT_COMPONENTS1="[ main, universe, restricted, multiverse ]"
 APT_SUBREPOS1="[ backports, updates ]"
 APT_GPGKEYID1="437D 05B5"
@@ -179,7 +179,7 @@ Twx6DKLF+3rF5nf1F3Q=
 =PBAe
 -----END PGP PUBLIC KEY BLOCK-----"
 APT_REPOSITORY2="http://security.ubuntu.com/ubuntu/"
-APT_DISTRIBUTIONS2="[ xenial ]"
+APT_DISTRIBUTIONS2="[ bionic ]"
 APT_COMPONENTS2="[ main, universe, restricted, multiverse ]"
 APT_SUBREPOS2="[ security ]"
 APT_GPGKEYID2="C0B2 1F32"
@@ -248,7 +248,7 @@ DjfegedFClqpn37b
 =rDTH
 -----END PGP PUBLIC KEY BLOCK-----"
 APT_REPOSITORY3="https://download.ceph.com/debian-mimic/"
-APT_DISTRIBUTIONS3="[ xenial ]"
+APT_DISTRIBUTIONS3="[ bionic ]"
 APT_COMPONENTS3="[ main ]"
 APT_GPGKEYID3="460F 3994"
 APT_GPGKEY3="-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -280,7 +280,7 @@ vkdivtdqrq2DXY+ftuqLOQ7b+t1RctbcMHGPptlxFuN9ufP5TiTWSpfqDwmHCLsT
 k2vFiMwcHdLpQ1IH8ORVRgPPsiBnBOJ/kIiXG2SxPUTjjEGOVgeA
 =/Tod
 -----END PGP PUBLIC KEY BLOCK-----"
-#deb https://download.ceph.com/debian-mimic/ xenial main
+#deb https://download.ceph.com/debian-mimic/ bionic main
 EXEC_DIR=/var/${NAME}/exec
 # this used in test_overrides to check amount of daemonsets defined
 EXPECTED_NUMBER_OF_DAEMONSETS=17