diff --git a/labs/osbash/scripts/ubuntu/setup_cinder_controller.sh b/labs/osbash/scripts/ubuntu/setup_cinder_controller.sh
index 4510858a..27c1b1ec 100755
--- a/labs/osbash/scripts/ubuntu/setup_cinder_controller.sh
+++ b/labs/osbash/scripts/ubuntu/setup_cinder_controller.sh
@@ -100,12 +100,8 @@ conf=/etc/cinder/cinder.conf
 echo "Setting database connection: $database_url."
 iniset_sudo $conf database connection "$database_url"
 
-# Configure [DEFAULT] section to use RabbitMQ message broker.
-iniset_sudo $conf DEFAULT rpc_backend rabbit
-
-iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
-iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
-iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
+echo "Configuring RabbitMQ message queue access."
+iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
 
 iniset_sudo $conf DEFAULT auth_strategy keystone
 
diff --git a/labs/osbash/scripts/ubuntu/setup_cinder_volumes.sh b/labs/osbash/scripts/ubuntu/setup_cinder_volumes.sh
index 030e5563..135fd766 100755
--- a/labs/osbash/scripts/ubuntu/setup_cinder_volumes.sh
+++ b/labs/osbash/scripts/ubuntu/setup_cinder_volumes.sh
@@ -79,12 +79,8 @@ cinder_admin_user=cinder
 echo "Setting database connection: $database_url."
 iniset_sudo $conf database connection "$database_url"
 
-# Configure [DEFAULT] section.
-iniset_sudo $conf DEFAULT rpc_backend rabbit
-
-iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
-iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
-iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
+echo "Configuring RabbitMQ message queue access."
+iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
 
 iniset_sudo $conf DEFAULT auth_strategy keystone
 
diff --git a/labs/osbash/scripts/ubuntu/setup_heat_controller.sh b/labs/osbash/scripts/ubuntu/setup_heat_controller.sh
index f8c009ca..b921faaa 100755
--- a/labs/osbash/scripts/ubuntu/setup_heat_controller.sh
+++ b/labs/osbash/scripts/ubuntu/setup_heat_controller.sh
@@ -142,13 +142,8 @@ iniset_sudo $conf database connection "$database_url"
 
 echo "Configuring keystone."
 
-# Configure [DEFAULT] section.
-iniset_sudo $conf DEFAULT rpc_backend rabbit
-
-# Configure [oslo_messaging_rabbit] section.
-iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
-iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
-iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
+echo "Configuring RabbitMQ message queue access."
+iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
 
 # Configure [keystone_authtoken] section.
 iniset_sudo $conf keystone_authtoken auth_uri http://controller:5000
diff --git a/labs/osbash/scripts/ubuntu/setup_neutron_compute.sh b/labs/osbash/scripts/ubuntu/setup_neutron_compute.sh
index 4031ddd2..2ffe49b6 100755
--- a/labs/osbash/scripts/ubuntu/setup_neutron_compute.sh
+++ b/labs/osbash/scripts/ubuntu/setup_neutron_compute.sh
@@ -30,12 +30,8 @@ echo "Configuring neutron for compute node."
 conf=/etc/neutron/neutron.conf
 echo "Configuring $conf."
 
-# Configure AMQP parameters
-iniset_sudo $conf DEFAULT rpc_backend rabbit
-
-iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
-iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
-iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
+echo "Configuring RabbitMQ message queue access."
+iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
 
 # Configuring [DEFAULT] section
 iniset_sudo $conf DEFAULT auth_strategy keystone
diff --git a/labs/osbash/scripts/ubuntu/setup_nova_compute.sh b/labs/osbash/scripts/ubuntu/setup_nova_compute.sh
index 8224dfb6..54925228 100755
--- a/labs/osbash/scripts/ubuntu/setup_nova_compute.sh
+++ b/labs/osbash/scripts/ubuntu/setup_nova_compute.sh
@@ -32,14 +32,8 @@ echo "Configuring nova for compute node."
 conf=/etc/nova/nova.conf
 echo "Configuring $conf."
 
-# Configure [DEFAULT] section.
-iniset_sudo $conf DEFAULT enabled_apis osapi_compute,metadata
-iniset_sudo $conf DEFAULT rpc_backend rabbit
-
-# Configure [oslo_messaging_rabbit] section.
-iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
-iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
-iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
+echo "Configuring RabbitMQ message queue access."
+iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
 
 # Configuring [DEFAULT] section.
 iniset_sudo $conf DEFAULT auth_strategy keystone
@@ -78,8 +72,11 @@ iniset_sudo $conf glance api_servers http://controller:9292
 # Configure [oslo_concurrency] section.
 iniset_sudo $conf oslo_concurrency lock_path /var/lib/nova/tmp
 
-# Delete logdir line
-sudo sed -i "/^logdir/ d" $conf
+# Delete log-dir line
+# According to the install-guide, "Due to a packaging bug, remove the log-dir
+# option from the [DEFAULT] section."
+sudo grep "^log-dir" $conf
+sudo sed -i "/^log-dir/ d" $conf
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Finalize installation
diff --git a/labs/osbash/scripts/ubuntu/setup_nova_controller.sh b/labs/osbash/scripts/ubuntu/setup_nova_controller.sh
index 7860f73e..a19c0779 100755
--- a/labs/osbash/scripts/ubuntu/setup_nova_controller.sh
+++ b/labs/osbash/scripts/ubuntu/setup_nova_controller.sh
@@ -75,9 +75,6 @@ sudo apt install -y nova-api nova-conductor nova-consoleauth \
 
 conf=/etc/nova/nova.conf
 
-# Configure [DEFAULT] section.
-iniset_sudo $conf DEFAULT enabled_apis osapi_compute,metadata
-
 # Configure [api_database] section.
 database_url="mysql+pymysql://$NOVA_DB_USER:$NOVA_DBPASS@controller/nova_api"
 echo "Setting API database connection: $database_url."
@@ -90,13 +87,8 @@ iniset_sudo $conf database connection "$database_url"
 
 echo "Configuring nova services."
 
-# Configure [DEFAULT] section.
-iniset_sudo $conf DEFAULT rpc_backend rabbit
-
-# Configure [oslo_messaging_rabbit] section.
-iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
-iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
-iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
+echo "Configuring RabbitMQ message queue access."
+iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
 
 # Configure [DEFAULT] section.
 iniset_sudo $conf DEFAULT auth_strategy keystone
@@ -127,10 +119,11 @@ iniset_sudo $conf glance api_servers http://controller:9292
 # Configure [oslo_concurrency] section.
 iniset_sudo $conf oslo_concurrency lock_path /var/lib/nova/tmp
 
-# Delete logdir line
-# According to install-guide, "Due to a packaging bug, remove the logdir option
-# from the [DEFAULT] section."
-sudo sed -i "/^logdir/ d" $conf
+# Delete log-dir line
+# According to the install-guide, "Due to a packaging bug, remove the log-dir
+# option from the [DEFAULT] section."
+sudo grep "^log-dir" $conf
+sudo sed -i "/^log-dir/ d" $conf
 
 echo "Populating the Compute databases."
 sudo nova-manage api_db sync
diff --git a/labs/osbash/scripts/ubuntu/setup_self-service_controller.sh b/labs/osbash/scripts/ubuntu/setup_self-service_controller.sh
index 76298511..2c1fed2a 100755
--- a/labs/osbash/scripts/ubuntu/setup_self-service_controller.sh
+++ b/labs/osbash/scripts/ubuntu/setup_self-service_controller.sh
@@ -53,12 +53,8 @@ iniset_sudo $conf DEFAULT core_plugin ml2
 iniset_sudo $conf DEFAULT service_plugins router
 iniset_sudo $conf DEFAULT allow_overlapping_ips True
 
-iniset_sudo $conf DEFAULT rpc_backend rabbit
-
-# Configure [oslo_messaging_rabbit] section.
-iniset_sudo $conf oslo_messaging_rabbit rabbit_host controller
-iniset_sudo $conf oslo_messaging_rabbit rabbit_userid openstack
-iniset_sudo $conf oslo_messaging_rabbit rabbit_password "$RABBIT_PASS"
+echo "Configuring RabbitMQ message queue access."
+iniset_sudo $conf DEFAULT transport_url "rabbit://openstack:$RABBIT_PASS@controller"
 
 # Configuring [DEFAULT] section.
 iniset_sudo $conf DEFAULT auth_strategy keystone