diff --git a/tools/openstack b/tools/openstack
index 8b7110f5e..fb5ccd8ba 100755
--- a/tools/openstack
+++ b/tools/openstack
@@ -98,14 +98,14 @@ function os_erase() {
 
 
 function os_install() {
-	sudo yum install -y openstack-nova openstack-glance openstack-keystone openstack-dashboard scsi-target-utils
+	sudo yum install -y openstack-utils openstack-nova openstack-glance openstack-keystone openstack-dashboard scsi-target-utils
 	sudo dd if=/dev/zero of=/var/lib/nova/nova-volumes.img bs=1M seek=20k count=0
 	sudo systemctl start mysqld.service
 	sleep 1
 	# Configure the databases
-	sudo openstack-nova-db-setup $*
-	sudo openstack-glance-db-setup $*
-	sudo openstack-keystone-db-setup $*
+	sudo openstack-db --service nova --init
+	sudo openstack-db --service glance --init
+	sudo openstack-db --service keystone --init
 
 	# Create a keystone RC file
 	mkdir -p $HOME/.openstack