diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml
index 17ad3475..b077aa1d 100644
--- a/Manifests/Manifest_LAOS-17.1.xml
+++ b/Manifests/Manifest_LAOS-17.1.xml
@@ -159,8 +159,8 @@
 
 	<!-- Moto G 3rd Gen (osprey)
 	<project path="device/motorola/msm8916-common" name="LineageOS/android_device_motorola_msm8916-common" remote="github" />
-	<project path="device/motorola/osprey" name="LineageOS/android_device_motorola_osprey" remote="github" /> -->
-	<project path="kernel/motorola/msm8916" name="LineageOS/android_kernel_motorola_msm8916" remote="github" />
+	<project path="device/motorola/osprey" name="LineageOS/android_device_motorola_osprey" remote="github" />
+	<project path="kernel/motorola/msm8916" name="LineageOS/android_kernel_motorola_msm8916" remote="github" /> -->
 
 	<!-- Moto X 2014 (victara) -->
 	<project path="device/motorola/victara" name="LineageOS/android_device_motorola_victara" remote="github" />
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index b868c94c..cce74612 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -76,6 +76,8 @@ buildAll() {
 	#Intel
 	buildDevice fugu; #broken
 
+	buildDevice cheeseburger verity; #needs manual patching - vendor common makefile
+	buildDevice dumpling verity;
 	if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then
 		#SD410
 		buildDevice crackling;
@@ -103,8 +105,7 @@ buildAll() {
 		buildDevice sailfish verity;
 		#SD835
 		buildDevice cheryl;
-		buildDevice cheeseburger verity; #needs manual patching - vendor common makefile
-		buildDevice dumpling verity;
+
 		buildDevice mata verity;
 		buildDevice taimen avb;
 		buildDevice walleye avb;
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh.disabled
similarity index 100%
rename from Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
rename to Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh.disabled
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index ab8e458a..87c336c2 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -85,8 +85,8 @@ buildAll() {
 	buildDevice sailfish verity;
 	#SD835
 	buildDevice cheryl;
-	buildDevice cheeseburger verity; #needs manual patching - vendor common makefile
-	buildDevice dumpling verity;
+	#buildDevice cheeseburger verity; #broken usb/modem/etc.
+	#buildDevice dumpling verity;
 	buildDevice mata verity;
 	buildDevice taimen avb;
 	buildDevice walleye avb;