diff --git a/Gemfile b/Gemfile
index e38dca9..8aaa777 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,24 +1,25 @@
 source 'https://rubygems.org'
 
 gem 'puppet', ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'].to_s : '>= 4.7'
 
 gem 'puppetlabs_spec_helper', '>= 0.1.0'
 gem 'puppet-lint', '>= 0.3.2'
 gem 'facter', '>= 1.7.0'
 gem 'rspec-puppet-facts', '>= 1.6.0'
 gem 'metadata-json-lint'
 gem 'semantic_puppet'
 
 group :system_tests do
   if (beaker_version = ENV['BEAKER_VERSION'])
     gem 'beaker', beaker_version
   end
   if (beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'])
     gem 'beaker-rspec', beaker_rspec_version
   else
-    gem 'beaker-rspec',  :require => false
+    gem 'beaker-rspec', require: false
   end
-  gem 'serverspec',                    :require => false
-  gem 'beaker-puppet_install_helper',  :require => false
-  gem 'beaker-module_install_helper',  :require => false
+  gem 'serverspec',                    require: false
+  gem 'beaker-puppet_install_helper',  require: false
+  gem 'beaker-module_install_helper',  require: false
+  gem 'beaker-vagrant',                require: false
 end
diff --git a/spec/acceptance/nodesets/debian-7-x64.yml b/spec/acceptance/nodesets/debian-7-x64.yml
deleted file mode 100644
index 5007535..0000000
--- a/spec/acceptance/nodesets/debian-7-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-HOSTS:
-  debian-7-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box: bento/debian-7
-    hypervisor: vagrant
-CONFIG:
-  type: foss
\ No newline at end of file
diff --git a/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml
new file mode 100644
index 0000000..60ff90e
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml
@@ -0,0 +1,10 @@
+---
+HOSTS:
+  ubuntu-server-1804-x64:
+    roles:
+      - master
+    platform: ubuntu-18.04-amd64
+    box: bento/ubuntu-18.04
+    hypervisor: vagrant
+CONFIG:
+  type: foss
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 6bca3bc..96855f3 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,28 +1,31 @@
 require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'
 
 run_puppet_install_helper
 
 RSpec.configure do |c|
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
   c.formatter = :documentation
 
-  install_module_from_forge('puppetlabs-vcsrepo', '>= 1.3.0 <= 3.0.0')
-  install_module_from_forge('puppetlabs-mysql', '>= 2.2.0 <= 5.0.0')
-  install_module_from_forge('puppetlabs-apache', '>= 1.11.0 <= 3.0.0')
-  install_module_from_forge('puppet-zypprepo', '>= 2.0.0 <= 3.0.0')
-  install_module_from_forge('puppetlabs-apt', '>= 2.0.0 <= 3.0.0')
-  install_module_from_forge('puppetlabs-yumrepo_core', '>= 1.0.0 <= 2.0.0')
+  install_module_from_forge('puppetlabs-stdlib', '>= 4.16.0 < 6.0.0')
+  install_module_from_forge('puppetlabs-concat', '>= 2.0.1 < 6.0.0')
+  install_module_from_forge('puppetlabs-vcsrepo', '>= 1.3.0 < 3.0.0')
+
+  install_module_from_forge('puppetlabs-mysql', '>= 2.2.0')
+  install_module_from_forge('puppetlabs-apache', '>= 1.11.0')
+  install_module_from_forge('puppet-zypprepo', '>= 2.0.0')
+  install_module_from_forge('puppetlabs-apt', '>= 2.0.0')
+  install_module_from_forge('puppetlabs-yumrepo_core', '>= 1.0.0')
 
   c.before :suite do
     hosts.each do |host|
       copy_module_to(host, source: proj_root, module_name: 'icingaweb2')
       if fact('osfamily') == 'RedHat'
         # Soft dep on epel for Passenger
         install_package(host, 'epel-release')
       end
     end
   end
 end