diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..85bf659
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/upstream-institute-virtual-environment.git
+
diff --git a/README.md b/README.md
index c9f9646..76a3933 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
OpenStack Upstream Institute Virtual Environment
================================================
-
+
Instructions
------------
@@ -38,13 +38,7 @@ Instructions
Getting around in the VM
------------------------
-1. Open a terminal and start devstack
- ``` bash
- /opt/devstack/stack.sh && optimize-memory
- ```
- This step takes about 10 minutes.
-
-2. Explore the environment. The four main software you will be using from the
+1. Explore the environment. The four main software you will be using from the
desktop during the training are:
* **Firefox** web browser
* **Xfce4-terminal** terminal emulator
@@ -53,19 +47,19 @@ Getting around in the VM
> please make sure that you replace the default user `ubuntu` upon first
> start before logging in to Freenode channels.
-3. When `stack.sh` finished running, you can open your [Horizon Dashboard]
+2. When `stack.sh` has finished running, you can open your [Horizon Dashboard]
(http://localhost/) or on VirtualBox using the **DevStack** bookmark
* **Login**: `demo`
* **Password**: `openstack`
-4. Select the `demo` project
+3. Select the `demo` project
-5. Start a VM. Use a tiny flavor. A CirrOS image is already set up by devstack
+4. Start a VM. Use a tiny flavor. A CirrOS image is already set up by devstack
-6. Assign a floating IP
+5. Assign a floating IP
-7. Enable SSH and ICMP ports on the security groups
+6. Enable SSH and ICMP ports on the security groups
[Horizon Dashboard]: http://localhost/
diff --git a/cleanup.sh b/cleanup.sh
index 27437ae..70a0cbc 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -26,15 +26,6 @@ sudo apt autoremove --purge -y humanity-icon-theme snapd lxc.* lxd.*
# Empty packages cache
sudo apt clean
sudo apt autoclean
-sudo rm -rf /var/lib/apt/lists/*
-
-# Remove mysql databases (will be recreated by stack.sh
-for db in cinder glance keystone neutron nova nova_api nova_cell0; do
- echo "drop database $db;" | mysql -uroot -popenstack
-done
-
-# Remove log files
-sudo rm -rf /var/log/*
# Zero out unused space
dd if=/dev/zero of=~/ZERO bs=1M status=progress
diff --git a/create-training-box.sh b/create-training-box.sh
index f0dcb26..a7e4c25 100755
--- a/create-training-box.sh
+++ b/create-training-box.sh
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+set -e
+
VDISKMANAGER_DOWNLOAD='https://kb.vmware.com/selfservice/viewAttachment.do?attachID=1023856-vdiskmanager-linux.7.0.1.zip&documentID=1023856'
vagrant up
diff --git a/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite b/files/home/ubuntu/.mozilla/firefox/profile/places.sqlite
similarity index 92%
rename from files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite
rename to files/home/ubuntu/.mozilla/firefox/profile/places.sqlite
index a1a3f9a..d648ce9 100644
Binary files a/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite and b/files/home/ubuntu/.mozilla/firefox/profile/places.sqlite differ
diff --git a/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/prefs.js b/files/home/ubuntu/.mozilla/firefox/profile/prefs.js
similarity index 98%
rename from files/home/ubuntu/.mozilla/firefox/yncyd31n.default/prefs.js
rename to files/home/ubuntu/.mozilla/firefox/profile/prefs.js
index 96630fa..e071782 100644
--- a/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/prefs.js
+++ b/files/home/ubuntu/.mozilla/firefox/profile/prefs.js
@@ -39,7 +39,7 @@ user_pref("browser.search.region", "CH");
user_pref("browser.sessionstore.upgradeBackup.latestBuildID", "20160919213721");
user_pref("browser.slowStartup.averageTime", 2435);
user_pref("browser.slowStartup.samples", 2);
-user_pref("browser.startup.homepage", "https://github.com/kmARC/openstack-training-virtual-environment/blob/master/README.md#getting-around-in-the-vm");
+user_pref("browser.startup.homepage", "http://bit.ly/upstream-institute-vm");
user_pref("browser.startup.homepage_override.buildID", "20160919213721");
user_pref("browser.startup.homepage_override.mstone", "49.0");
user_pref("browser.tabs.remote.autostart.2", true);
diff --git a/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/xulstore.json b/files/home/ubuntu/.mozilla/firefox/profile/xulstore.json
similarity index 100%
rename from files/home/ubuntu/.mozilla/firefox/yncyd31n.default/xulstore.json
rename to files/home/ubuntu/.mozilla/firefox/profile/xulstore.json
diff --git a/files/home/ubuntu/.mozilla/firefox/profiles.ini b/files/home/ubuntu/.mozilla/firefox/profiles.ini
index a5ef88a..eb2a147 100644
--- a/files/home/ubuntu/.mozilla/firefox/profiles.ini
+++ b/files/home/ubuntu/.mozilla/firefox/profiles.ini
@@ -4,6 +4,6 @@ StartWithLastProfile=1
[Profile0]
Name=default
IsRelative=1
-Path=yncyd31n.default
+Path=profile
Default=1
diff --git a/install-base.sh b/install-base.sh
index ef52b75..cbca242 100755
--- a/install-base.sh
+++ b/install-base.sh
@@ -7,13 +7,14 @@ export DEBIAN_FRONTEND=noninteractive
REPO=$(dirname "$(readlink -f "$0")")/
# Copy configs
-sudo cp -ar "$REPO/files/etc" /
-sudo cp -ar "$REPO/files/home" /
+sudo cp -r "$REPO/files/etc" /
+sudo cp -r "$REPO/files/home" /
sudo chown -R "$USER:$GROUP" /home/
# Copy scripts
-sudo cp -ar "$REPO/files/usr" /
+sudo cp -r "$REPO/files/usr" /
+# Update and upgrade
sudo sed -i "s@http://archive.ubuntu.com@$APT_MIRROR@g" /etc/apt/sources.list
sudo apt update
sudo apt dist-upgrade -y
diff --git a/install-devstack.sh b/install-devstack.sh
index acd34a5..cc1b056 100755
--- a/install-devstack.sh
+++ b/install-devstack.sh
@@ -8,7 +8,7 @@ sudo chown -R "$USER:$GROUP" /opt/devstack
git clone --depth=1 https://git.openstack.org/openstack-dev/devstack \
/opt/devstack
-cp -ar "$REPO/files/opt" /
+cp -r "$REPO/files/opt" /
/opt/devstack/stack.sh