diff --git a/default.xml b/default.xml
index 4319879..5b44592 100644
--- a/default.xml
+++ b/default.xml
@@ -28,6 +28,7 @@
 
   <!-- AOSP Projects -->
 
+<!-- SHIFT
   <project path="build/make" name="LineageOS/android_build" groups="pdk,sysui-studio" >
     <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
     <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
@@ -36,6 +37,7 @@
     <linkfile src="target" dest="build/target" />
     <linkfile src="tools" dest="build/tools" />
   </project>
+-->
   <project path="build/bazel" name="platform/build/bazel" groups="pdk" remote="aosp" >
     <linkfile src="bazel.WORKSPACE" dest="WORKSPACE" />
     <linkfile src="bazel.BUILD" dest="BUILD" />
@@ -43,11 +45,13 @@
   <project path="build/bazel_common_rules" name="platform/build/bazel_common_rules" groups="pdk" remote="aosp" />
   <project path="build/blueprint" name="LineageOS/android_build_blueprint" groups="pdk,tradefed" />
   <project path="build/pesto" name="platform/build/pesto" groups="pdk" remote="aosp" />
+<!-- SHIFT
   <project path="build/release" name="platform/build/release" groups="pdk,tradefed" remote="aosp" />
   <project path="build/soong" name="LineageOS/android_build_soong" groups="pdk,tradefed" >
     <linkfile src="root.bp" dest="Android.bp" />
     <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
   </project>
+-->
   <project path="art" name="platform/art" groups="pdk" remote="aosp" />
   <project path="bionic" name="LineageOS/android_bionic" groups="pdk" />
   <project path="bootable/deprecated-ota" name="LineageOS/android_bootable_deprecated-ota" groups="pdk-cw" />
diff --git a/snippets/shift.xml b/snippets/shift.xml
index 97a0a1f..ea34c87 100644
--- a/snippets/shift.xml
+++ b/snippets/shift.xml
@@ -3,6 +3,21 @@
   <!-- Manifest -->
   <project path="android" name="SHIFTPHONES/android" groups="shift" remote="shift" />
 
+  <!-- Build -->
+  <project path="build/make" name="SHIFTPHONES/android_build" remote="shift">
+    <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
+    <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
+    <linkfile src="core" dest="build/core" />
+    <linkfile src="envsetup.sh" dest="build/envsetup.sh" />
+    <linkfile src="target" dest="build/target" />
+    <linkfile src="tools" dest="build/tools" />
+  </project>
+  <project path="build/release" name="SHIFTPHONES/android_build_release" remote="shift" />
+  <project path="build/soong" name="SHIFTPHONES/android_build_soong" remote="shift">
+    <linkfile src="root.bp" dest="Android.bp" />
+    <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
+  </project>
+
   <!-- Device -->
   <project path="device/shift/axolotl" name="SHIFTPHONES/android_device_shift_axolotl" remote="shift" />
   <project path="device/shift/axolotl/shiftos" name="SHIFTPHONES/android_device_shift_axolotl-shiftos" remote="shift" />