diff --git a/Vagrantfile b/Vagrantfile
index f271c0e..b39c943 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -110,7 +110,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #
   # The boot time is long for these, so I recommend that you convert to a local
   # version as soon as you can.
-  config.vm.box = conf['box_name'] || 'ubuntu/xenial64'
+  config.vm.box = conf['box_name'] || 'ubuntu/bionic64'
   config.vm.box_url = conf['box_url'] if conf['box_url']
 
   if Vagrant.has_plugin?("vagrant-cachier")
diff --git a/puppet/manifests/default.pp b/puppet/manifests/default.pp
index fd73d4a..4050715 100644
--- a/puppet/manifests/default.pp
+++ b/puppet/manifests/default.pp
@@ -6,4 +6,8 @@ node default {
   }
   include grenade
   include devstack
+
+  Class['base'] -> Class['user::stack'] -> Class['user::vagrant']
+  Class['user::stack'] -> Class['grenade']
+  Class['user::stack'] -> Class['devstack']
 }