diff --git a/Vagrantfile b/Vagrantfile
index b28277e81..36571dcdf 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,7 +12,7 @@ MEMORY = 12288
 
 # Every Vagrant development environment requires a box. You can search for
 # boxes at https://vagrantcloud.com/search.
-BOX = "generic/ubuntu1604"
+BOX = "generic/ubuntu1804"
 
 HOSTNAME = "tobiko"
 
@@ -24,7 +24,7 @@ OPENSTACK_GIT_BASE = "https://git.openstack.org"
 
 # DevStack Git repo URL and branch
 DEVSTACK_GIT_REPO = "#{OPENSTACK_GIT_BASE}/openstack-dev/devstack"
-DEVSTACK_GIT_BRANCH = "stable/queens"
+DEVSTACK_GIT_BRANCH = "master"
 
 # DevStack destination directory
 DEVSTACK_DEST_DIR = "/opt/stack"
diff --git a/devstack/vagrant/local.conf b/devstack/vagrant/local.conf
index 47f31a28c..f484661cf 100644
--- a/devstack/vagrant/local.conf
+++ b/devstack/vagrant/local.conf
@@ -22,10 +22,10 @@ enable_plugin heat https://git.openstack.org/openstack/heat
 # Configure Glance ------------------------------------------------------------
 
 # download and register a VM image that heat can launch
-IMAGE_URL_SITE="https://download.fedoraproject.org"
-IMAGE_URL_PATH="/pub/fedora/linux/releases/29/Cloud/x86_64/images/"
-IMAGE_URL_FILE="Fedora-Cloud-Base-29-1.2.x86_64.qcow2"
-IMAGE_URLS+=","$IMAGE_URL_SITE$IMAGE_URL_PATH$IMAGE_URL_FILE
+# IMAGE_URL_SITE="https://download.fedoraproject.org"
+# IMAGE_URL_PATH="/pub/fedora/linux/releases/29/Cloud/x86_64/images/"
+# IMAGE_URL_FILE="Fedora-Cloud-Base-29-1.2.x86_64.qcow2"
+# IMAGE_URLS+=","$IMAGE_URL_SITE$IMAGE_URL_PATH$IMAGE_URL_FILE
 
 # Configure Nova --------------------------------------------------------------