diff --git a/default.xml b/default.xml
index e7fd0b6..eda5f03 100644
--- a/default.xml
+++ b/default.xml
@@ -1,65 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-
-  <remote  name="opencord"
-           fetch=".."
-           review="https://gerrit.opencord.org/"
-           revision="cord-4.0" />
-  <default revision="cord-4.0"
-           remote="opencord"
-           sync-j="4" />
-
-<project path="build" name="cord" groups="build"/>
-<project path="build/maas" name="maas" groups="build"/>
-<project path="build/platform-install" name="platform-install" groups="build"/>
-
-<project path="onos-apps" name="cord-onos-publisher" groups="onos"/>
-
-<project path="test/cord-tester" name="cord-tester" groups="test"/>
-<project path="test/fabric-oftest" name="fabric-oftest" groups="test"/>
-
-<project path="orchestration/xos" name="xos" groups="orchestration"/>
-<project path="orchestration/xos_services/addressmanager" name="addressmanager" groups="orchestration,services"/>
-<project path="orchestration/xos_services/exampleservice" name="exampleservice" groups="orchestration,services"/>
-<project path="orchestration/xos_services/fabric" name="fabric" groups="orchestration,services"/>
-<project path="orchestration/xos_services/hypercache" name="hypercache" groups="orchestration,services"/>
-<project path="orchestration/xos_services/monitoring" name="monitoring" groups="orchestration,services"/>
-<project path="orchestration/xos_services/onos-service" name="onos-service" groups="orchestration,services"/>
-<project path="orchestration/xos_services/openstack" name="openstack" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vrouter" name="vrouter" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vsg" name="vsg" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vtr" name="vtr" groups="orchestration,services"/>
-<project path="orchestration/xos_services/globalxos" name="globalxos" groups="orchestration,services"/>
-<project path="orchestration/xos_services/olt-service" name="olt-service" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vtn-service" name="vtn-service" groups="orchestration,services"/>
-
-<project path="orchestration/xos_services/vbbu" name="vBBU" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vmme" name="vMME" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vpgwc" name="vPGWC" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vsgw" name="vSGW" groups="orchestration,services"/>
-<project path="orchestration/xos_services/progran" name="progran" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vhss" name="vHSS" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vmm" name="vMM" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vsm" name="vSM" groups="orchestration,services"/>
-
-<project path="orchestration/xos_services/vEE" name="vEE" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vEG" name="vEG" groups="orchestration,services"/>
-<project path="orchestration/xos_services/metronet-local" name="metronet-local" groups="orchestration,services" upstream="master"/>
-<project path="onos-apps/apps/carrierethernet" name="carrierethernet" groups="onos" upstream="master"/>
-<project path="orchestration/xos_services/vnaas" name="vnaas" groups="orchestration,services"/>
-
-<project path="orchestration/profiles/rcord" name="rcord" groups="orchestration,profiles"/> 
-<project path="orchestration/profiles/ecord" name="ecord" groups="orchestration,profiles"/> 
-<project path="orchestration/profiles/mcord" name="mcord" groups="orchestration,profiles"/> 
-<project path="orchestration/profiles/opencloud" name="opencloud" groups="orchestration,profiles"/> 
-
-<project path="orchestration/xos-gui" name="xos-gui" groups="orchestration"/>
-<project path="orchestration/xos-tosca" name="xos-tosca" groups="orchestration"/>
-<project path="orchestration/xos-sample-gui-extension" name="xos-sample-gui-extension" groups="orchestration"/>
-<project path="orchestration/xos-rest-gw" name="xos-rest-gw" groups="orchestration"/>
-
-<project path="component/chameleon" name="chameleon" groups="voltha">
-    <linkfile src="." dest="incubator/voltha/chameleon"/>
-</project>
-
+  <remote fetch=".." name="opencord" review="https://gerrit.opencord.org/" revision="cord-4.0"/>
+  
+  <default remote="opencord" revision="cord-4.0" sync-j="4"/>
+  
+  <project groups="orchestration,services" name="addressmanager" path="orchestration/xos_services/addressmanager" revision="323788334e407b49c8f959a26cd25c4e5526f606" upstream="cord-4.0"/>
+  <project groups="onos" name="carrierethernet" path="onos-apps/apps/carrierethernet" revision="9e519ef4bfcb03607df3a7ecc2d10f0ea7d6e0e4" upstream="master"/>
+  <project groups="voltha" name="chameleon" path="component/chameleon" revision="eb81ea90200a12d379876d37314a9e225c66ab9d" upstream="cord-4.0">
+    <linkfile dest="incubator/voltha/chameleon" src="."/>
+  </project>
+  <project groups="build" name="cord" path="build" revision="870892108291b0e66945b5b431580173aaf4e134" upstream="cord-4.0"/>
+  <project groups="onos" name="cord-onos-publisher" path="onos-apps" revision="d01d4ff02796b2eddb8601ed7791156f253f5187" upstream="cord-4.0"/>
+  <project groups="test" name="cord-tester" path="test/cord-tester" revision="c713e45847bd378a3b734e97bc32e4df8514519c" upstream="cord-4.0"/>
+  <project groups="orchestration,profiles" name="ecord" path="orchestration/profiles/ecord" revision="6c8b367655fb6a4e35ea93d47e7e36276faecbf2" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="exampleservice" path="orchestration/xos_services/exampleservice" revision="990fa533bc0b8d43322eefa9a8ef0f0332ff9cbf" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="fabric" path="orchestration/xos_services/fabric" revision="6a020fca85154c5228d7f93d0d60524e9a52de2d" upstream="cord-4.0"/>
+  <project groups="test" name="fabric-oftest" path="test/fabric-oftest" revision="af5505c035972bcf1d4d0f5672758e3ab1d12b26" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="globalxos" path="orchestration/xos_services/globalxos" revision="f5e1033ad686a7f093beac9d49a537e4e80cda59" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="hypercache" path="orchestration/xos_services/hypercache" revision="ede125bce89bd13fb276679e0af8a92ebc8f6be0" upstream="cord-4.0"/>
+  <project groups="build" name="maas" path="build/maas" revision="ffd727282657914de7fd69b9eb3551937d4dd7b5" upstream="cord-4.0"/>
+  <project groups="orchestration,profiles" name="mcord" path="orchestration/profiles/mcord" revision="f96a8c8cadbedd782c2be664f74801be73462f27" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="metronet-local" path="orchestration/xos_services/metronet-local" revision="6137a2527bc6de1277642eedc891e47856ebb4e5" upstream="master"/>
+  <project groups="orchestration,services" name="monitoring" path="orchestration/xos_services/monitoring" revision="df97081abcd640f857b9287f0ab75822cf290e37" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="olt-service" path="orchestration/xos_services/olt-service" revision="9545fd8c5a0aaccdf042811e9ab862d3dc7cbbf8" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="onos-service" path="orchestration/xos_services/onos-service" revision="e154d3852d65c9b9987e7e59a68b4eb01c2a5edb" upstream="cord-4.0"/>
+  <project groups="orchestration,profiles" name="opencloud" path="orchestration/profiles/opencloud" revision="1a22f77e9ac743fd638bfb610a32f82cf52538e4" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="openstack" path="orchestration/xos_services/openstack" revision="359e6f9078af7e647fca3766488f21f59d695be8" upstream="cord-4.0"/>
+  <project groups="build" name="platform-install" path="build/platform-install" revision="c9caee61a57aa5d69a6d40b30125a6d715378e40" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="progran" path="orchestration/xos_services/progran" revision="7f755a359c9f2af0ba316d4318da0f6fa2be1308" upstream="cord-4.0"/>
+  <project groups="orchestration,profiles" name="rcord" path="orchestration/profiles/rcord" revision="5cdf61469bd7a80493ee6dfe65945722fa1360d8" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vBBU" path="orchestration/xos_services/vbbu" revision="eb3487c4916cdf43d181e9d584dc4fe2b37516ef" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vEE" path="orchestration/xos_services/vEE" revision="a4c4898ea2f92fbc370a2f83d0a0a00ebe72cd1f" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vEG" path="orchestration/xos_services/vEG" revision="747d52a4049d7def1cf5285ad7861965cb9f362c" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vHSS" path="orchestration/xos_services/vhss" revision="d1488a7edcdb0e1ce8b852ecc759f6bc5ab90fb2" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vMM" path="orchestration/xos_services/vmm" revision="ea225bc0e768aead78e62b6db7ff403b17144bb0" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vMME" path="orchestration/xos_services/vmme" revision="5b7a5d48134b8d4ba36b8d5afbd9402ff1bd09c9" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vPGWC" path="orchestration/xos_services/vpgwc" revision="86d63697328235d5a648628f25b1bc93c025e04d" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vSGW" path="orchestration/xos_services/vsgw" revision="41ed0995a20ceaf4208ff76c4c9e6edddcc4f8ac" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vSM" path="orchestration/xos_services/vsm" revision="f6b63f0e2a87f2c07d89e9d920d94bdf18b67568" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vnaas" path="orchestration/xos_services/vnaas" revision="27399a0f2682e64939bca623c70ff70fed0d79ad" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vrouter" path="orchestration/xos_services/vrouter" revision="36cec1e1acda17c9f9bfacf66795f9fb743eacc9" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vsg" path="orchestration/xos_services/vsg" revision="7771a669ad5bf8e7b2435ae5acddb4848da53cc8" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vtn-service" path="orchestration/xos_services/vtn-service" revision="579c0039cee77f9657b7f963a3bf7d122c6f4e69" upstream="cord-4.0"/>
+  <project groups="orchestration,services" name="vtr" path="orchestration/xos_services/vtr" revision="cd2caa7a78ec7e0a6e91f478661078cb2672e685" upstream="cord-4.0"/>
+  <project groups="orchestration" name="xos" path="orchestration/xos" revision="ff2c21fef4d5608c0ecc2c695a02d7f6817da694" upstream="cord-4.0"/>
+  <project groups="orchestration" name="xos-gui" path="orchestration/xos-gui" revision="f5739de72e9cd15a5619e415c092552f47f2fdb0" upstream="cord-4.0"/>
+  <project groups="orchestration" name="xos-rest-gw" path="orchestration/xos-rest-gw" revision="53620228c2b497bfd4554d7e61672c7294c598ec" upstream="cord-4.0"/>
+  <project groups="orchestration" name="xos-sample-gui-extension" path="orchestration/xos-sample-gui-extension" revision="4f6067c0fdcb30c831bc89d5561b5dd762138e9d" upstream="cord-4.0"/>
+  <project groups="orchestration" name="xos-tosca" path="orchestration/xos-tosca" revision="34e3a1d5d931974ce403f8ef8a2b2d5d3c4aa020" upstream="cord-4.0"/>
 </manifest>