diff --git a/enterprise.xml b/enterprise.xml
index 7852c94..2e51312 100644
--- a/enterprise.xml
+++ b/enterprise.xml
@@ -13,7 +13,7 @@
     <!-- END imx specific build tools -->
 
     <!-- BEGIN imx BSP build config -->
-    <project name="board-enterprise" path="board" revision="4.14.98" />
+    <project name="board-enterprise" path="board" />
     <!-- END imx BSP build config -->
 
     <!-- BEGIN imx bootloader -->
@@ -22,33 +22,33 @@
     <!-- END imx bootloader -->
 
     <!-- BEGIN imx linux -->
-    <project name="linux-imx" path="linux-imx" revision="4.14.98" />
-    <project name="linux-imx-debian" path="packages/linux-imx" revision="4.14.98" />
+    <project name="linux-imx" path="linux-imx"  />
+    <project name="linux-imx-debian" path="packages/linux-imx"  />
     <!-- END imx linux -->
 
     <project name="libdrm-imx" path="libdrm-imx" />
     <project name="libdrm-imx-debian" path="packages/libdrm-imx" />
-    <project name="imx-firmware" path="imx-firmware" revision="4.14.98" />
-    <project name="imx-firmware-debian" path="packages/imx-firmware" revision="4.14.98" />
+    <project name="imx-firmware" path="imx-firmware"  />
+    <project name="imx-firmware-debian" path="packages/imx-firmware"  />
 
     <project name="imx-atf" path="imx-atf" />
     <project name="imx-atf-debian" path="packages/imx-atf" />
 
-    <project path="imx-gstreamer" name="imx-gstreamer" revision="4.14.98" />
-    <project path="imx-gst-plugins-base" name="imx-gst-plugins-base" revision="4.14.98" />
-    <project path="imx-gst-plugins-good" name="imx-gst-plugins-good" revision="4.14.98" />
-    <project path="imx-gst-plugins-bad" name="imx-gst-plugins-bad" revision="4.14.98" />
-    <project path="imx-gst1.0-plugin" name="imx-gst1.0-plugin" revision="4.14.98" />
+    <project path="imx-gstreamer" name="imx-gstreamer"  />
+    <project path="imx-gst-plugins-base" name="imx-gst-plugins-base"  />
+    <project path="imx-gst-plugins-good" name="imx-gst-plugins-good"  />
+    <project path="imx-gst-plugins-bad" name="imx-gst-plugins-bad"  />
+    <project path="imx-gst1.0-plugin" name="imx-gst1.0-plugin"  />
     <project path="packages/imx-board-tools" name="imx-board-tools" />
-    <project path="packages/imx-gstreamer" name="imx-gstreamer-debian" revision="4.14.98" />
-    <project path="packages/imx-gst-plugins-base" name="imx-gst-plugins-base-debian" revision="4.14.98" />
-    <project path="packages/imx-gst-plugins-good" name="imx-gst-plugins-good-debian" revision="4.14.98" />
-    <project path="packages/imx-gst-plugins-bad" name="imx-gst-plugins-bad-debian" revision="4.14.98" />
-    <project path="packages/imx-gst1.0-plugin" name="imx-gst1.0-plugin-debian" revision="4.14.98" />
-    <project path="packages/gst-plugins-ugly1.0" name="gst-plugins-ugly1.0" revision="4.14.98" />
+    <project path="packages/imx-gstreamer" name="imx-gstreamer-debian"  />
+    <project path="packages/imx-gst-plugins-base" name="imx-gst-plugins-base-debian"  />
+    <project path="packages/imx-gst-plugins-good" name="imx-gst-plugins-good-debian"  />
+    <project path="packages/imx-gst-plugins-bad" name="imx-gst-plugins-bad-debian"  />
+    <project path="packages/imx-gst1.0-plugin" name="imx-gst1.0-plugin-debian"  />
+    <project path="packages/gst-plugins-ugly1.0" name="gst-plugins-ugly1.0"  />
 
-    <project path="wayland-protocols-imx" name="wayland-protocols-imx" revision="4.14.98" />
-    <project path="packages/wayland-protocols-imx" name="wayland-protocols-imx-debian" revision="4.14.98" />
+    <project path="wayland-protocols-imx" name="wayland-protocols-imx"  />
+    <project path="packages/wayland-protocols-imx" name="wayland-protocols-imx-debian"  />
 
     <project path="weston-imx" name="weston-imx" />
     <project path="packages/weston-imx" name="weston-imx-debian" />
@@ -56,39 +56,34 @@
     <project path="bluez-imx" name="bluez-imx" />
     <project path="packages/bluez-imx" name="bluez-imx-debian" />
 
-    <project path="packages/edgetpu" name="edgetpu" revision="release-diploria"/>
-    <project path="packages/edgetpuvision" name="edgetpuvision" revision="4.14.98" />
+    <project path="packages/edgetpu" name="edgetpu" />
+    <project path="packages/edgetpuvision" name="edgetpuvision"  />
     <project path="packages/edgetpudemo" name="edgetpudemo" />
 
     <project path="packages/imx-board-audio" name="imx-board-audio" />
-    <project path="packages/imx-board-wlan" name="imx-board-wlan" revision="4.14.98" />
-    <project path="imx-board-wlan" name="imx-board-wlan-src" revision="4.14.98" />
+    <project path="packages/imx-board-wlan" name="imx-board-wlan"  />
+    <project path="imx-board-wlan" name="imx-board-wlan-src"  />
 
-    <project path="packages/meta-enterprise" name="meta-enterprise" revision="4.14.98" />
+    <project path="packages/meta-enterprise" name="meta-enterprise"  />
     <!-- END imx specific repos -->
 
-    <project path="a71ch-crypto-support" name="a71ch-crypto-support"
-      groups="notdefault,internal" remote="coral-internal" />
-    <project path="packages/a71-crypto-support" name="a71ch-crypto-support-package"
-      groups="notdefault,internal" remote="coral-internal" />
-
     <!-- BEGIN closed source repositories -->
-    <project name="imx-gpu-viv" path="imx-gpu-viv" revision="4.14.98"
+    <project name="imx-gpu-viv" path="imx-gpu-viv"
       groups="notdefault,internal" remote="coral-internal" />
-    <project name="imx-gpu-viv-debian" path="packages/imx-gpu-viv" revision="4.14.98"
+    <project name="imx-gpu-viv-debian" path="packages/imx-gpu-viv"
       groups="notdefault,internal" remote="coral-internal" />
 
-    <project name="imx-vpu-hantro" path="imx-vpu-hantro" revision="4.14.98"
+    <project name="imx-vpu-hantro" path="imx-vpu-hantro"
       groups="notdefault,internal" remote="coral-internal" />
-    <project name="imx-vpu-hantro-debian" path="packages/imx-vpu-hantro" revision="4.14.98"
+    <project name="imx-vpu-hantro-debian" path="packages/imx-vpu-hantro"
       groups="notdefault,internal" remote="coral-internal" />
 
-    <project name="imx-vpuwrap" path="imx-vpuwrap" revision="4.14.98"
+    <project name="imx-vpuwrap" path="imx-vpuwrap"
       groups="notdefault,internal" remote="coral-internal" />
-    <project name="imx-vpuwrap-debian" path="packages/imx-vpuwrap" revision="4.14.98"
+    <project name="imx-vpuwrap-debian" path="packages/imx-vpuwrap"
       groups="notdefault,internal" remote="coral-internal" />
 
     <project name="kokoro-enterprise" path="kokoro"
-      groups="notdefault,internal" remote="coral-internal" revision="4.14.98" />
+      groups="notdefault,internal" remote="coral-internal"  />
     <!-- END closed source repositories -->
 </manifest>
diff --git a/mendel.xml b/mendel.xml
index 8ac58a4..c625542 100644
--- a/mendel.xml
+++ b/mendel.xml
@@ -5,7 +5,7 @@
     <remote fetch="sso://aiyprojects" name="coral-internal"
       review="sso://aiyprojects" />
 
-    <default remote="coral" revision="master" />
+    <default remote="coral" revision="staging" />
 
     <project name="manifest" path="manifest" />
 
@@ -14,7 +14,7 @@
     </project>
 
     <!-- BEGIN Build system -->
-    <project name="build" path="build" revision="4.14.98" >
+    <project name="build" path="build">
       <linkfile src="Makefile" dest="Makefile" />
     </project>
     <!-- END Build system -->