diff --git a/tools/dev/p4vm/root-bootstrap.sh b/tools/dev/p4vm/root-bootstrap.sh
index dfbfd46..f413cc6 100755
--- a/tools/dev/p4vm/root-bootstrap.sh
+++ b/tools/dev/p4vm/root-bootstrap.sh
@@ -11,14 +11,13 @@
 usermod -aG vboxsf sdn
 update-locale LC_ALL="en_US.UTF-8"
 
+
 if [ ${VM_TYPE} = "tutorial" ]
 then
-    cp /vagrant/tutorial-bootstrap.sh /home/sdn/tutorial.sh
-    sudo chown sdn:sdn /home/sdn/tutorial.sh
     su sdn <<'EOF'
-bash /home/sdn/tutorial.sh
+cd /home/sdn
+bash /vagrant/tutorial-bootstrap.sh
 EOF
-    rm -rf /home/sdn/tutorial.sh
 fi
 
 # Java 8
@@ -27,24 +26,27 @@
 apt-get update
 echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections
 
-# Workaround to: https://stackoverflow.com/questions/46815897/jdk-8-is-not-installed-error-404-not-found
-set +e
-apt-get install -y oracle-java8-installer
-set -e
-sed -i 's|JAVA_VERSION=8u161|JAVA_VERSION=8u171|' /var/lib/dpkg/info/oracle-java8-installer.*
-sed -i 's|PARTNER_URL=http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/|PARTNER_URL=http://download.oracle.com/otn-pub/java/jdk/8u171-b11/512cd62ec5174c3487ac17c61aaa89e8/|' /var/lib/dpkg/info/oracle-java8-installer.*
-sed -i 's|SHA256SUM_TGZ="6dbc56a0e3310b69e91bb64db63a485bd7b6a8083f08e48047276380a0e2021e"|SHA256SUM_TGZ="b6dd2837efaaec4109b36cfbb94a774db100029f98b0d78be68c27bec0275982"|' /var/lib/dpkg/info/oracle-java8-installer.*
-sed -i 's|J_DIR=jdk1.8.0_161|J_DIR=jdk1.8.0_171|' /var/lib/dpkg/info/oracle-java8-installer.*
-
 apt-get -y --no-install-recommends install \
+    avahi-daemon \
+    bridge-utils \
+    git \
+    git-review \
+    htop \
     oracle-java8-installer \
     oracle-java8-set-default \
-    zip unzip \
-    bridge-utils \
-    avahi-daemon \
-    htop \
+    python2.7 \
+    python2.7-dev \
     valgrind \
-    git-review
+    zip unzip \
+    tcpdump \
+    vlan \
+    ntp \
+    vim nano emacs \
+
+
+curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+python2.7 get-pip.py --force-reinstall
+rm -f get-pip.py
 
 tee -a /etc/ssh/sshd_config <<EOF