diff --git a/.kitchen.yml b/.kitchen.yml
index 0ca0e09..b442a98 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,7 +18,7 @@ platforms:
       run_command: /lib/systemd/systemd
       provision_command:
         - yum install udev systemd-sysv libicu git -y
-  - name: ubuntu-16.04
+  - name: ubuntu-18.04
     driver_config:
       run_command: /lib/systemd/systemd
       provision_command:
diff --git a/.travis.yml b/.travis.yml
index 4cb0fac..d5cf2e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,10 @@ env:
   matrix:
     - INSTANCE: bareos-postgresql-debian-9
     - INSTANCE: bareos-postgresql-centos-7
-    - INSTANCE: bareos-postgresql-ubuntu-1604
+    - INSTANCE: bareos-postgresql-ubuntu-1804
     - INSTANCE: bareos-mysql-debian-9
     - INSTANCE: bareos-mysql-centos-7
-    - INSTANCE: bareos-mysql-ubuntu-1604
+    - INSTANCE: bareos-mysql-ubuntu-1804
 
 script:
   - bundle exec kitchen verify ${INSTANCE}