diff --git a/build.gradle b/build.gradle
index 9478738..f29afa3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,11 +84,13 @@
 
     // Component table
     comps = [
+            // ONOS 1.8.1.SNAPSHOT from the support branch
+            // This is probably not exactly what we want
             'onosproject/onos': [
                     'type':     'image',
                     'upstream': upstreamReg,
                     'name':     'onosproject/onos',
-                    'digest':   'sha256:6c310b6bc798f745977973c8c883d3dd1eb250fd124ae4d627fd98a69efb5afc'
+                    'digest':   'sha256:83aa5b1f43d4bf772929dc5aacf3f57cbd4467a4c7184586b53a35ea8a23226a'
             ],
             'nginx': [
                     'type':     'image',
diff --git a/scripts/cord-in-a-box.sh b/scripts/cord-in-a-box.sh
index b4068cc..4a410ea 100755
--- a/scripts/cord-in-a-box.sh
+++ b/scripts/cord-in-a-box.sh
@@ -85,8 +85,7 @@
 function vagrant_vms_up() {
   cd $CORDDIR/build
 
-  sudo su $USER -c 'vagrant up corddev --provider libvirt'
-  sudo su $USER -c 'vagrant up prod --provider libvirt'
+  sudo su $USER -c 'vagrant up corddev prod --provider libvirt'
 
   # This is a workaround for a weird issue with ARP cache timeout breaking 'vagrant ssh'
   # It allows SSH'ing to the machine via 'ssh corddev'