diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh
index 46b3b2f6..12b7de78 100644
--- a/Scripts/Common/Deblob.sh
+++ b/Scripts/Common/Deblob.sh
@@ -271,6 +271,8 @@ echo "Deblobbing...";
 	blobs=$blobs"|HardwareInfo.apk";
 	blobs=$blobs"|SCONE.apk"; #???
 	blobs=$blobs"|DevicePersonalizationPrebuilt.*.apk|DeviceIntelligence.*.apk";
+	blobs=$blobs"|QualifiedNetworksService.apk";
+	blobs=$blobs"|qualifiednetworksservice.xml";
 	blobs=$blobs"|libhwinfo.jar|com.google.android.hardwareinfo.xml";
 	overlay=$overlay"|config_defaultAttentionService|config_defaultSystemCaptionsManagerService|config_defaultSystemCaptionsService|config_systemAmbientAudioIntelligence|config_systemAudioIntelligence|config_systemNotificationIntelligence|config_systemTextIntelligence|config_systemUiIntelligence|config_systemVisualIntelligence|config_defaultContentSuggestionsService";
 	overlay=$overlay"|config_defaultWellbeingPackage|config_defaultSupervisionProfileOwnerComponent";
diff --git a/Scripts/Common/Enable_Verity.sh b/Scripts/Common/Enable_Verity.sh
index 04d5c91d..9190f151 100644
--- a/Scripts/Common/Enable_Verity.sh
+++ b/Scripts/Common/Enable_Verity.sh
@@ -49,19 +49,22 @@ enableAVB() {
 		fi;
 		#Disable chaining
 		awk -i inplace '!/BOARD_AVB_VBMETA_SYSTEM/' *.mk &>/dev/null || true;
+		awk -i inplace '!/BOARD_AVB_VBMETA_VENDOR/' *.mk &>/dev/null || true;
 		awk -i inplace '!/BOARD_AVB_BOOT/' *.mk &>/dev/null || true;
 		#awk -i inplace '!/BOARD_AVB_RECOVERY/' *.mk &>/dev/null || true; #Must be defined for if non-A/B is supported.
 		awk -i inplace '!/vbmeta_system \\/' *.mk &>/dev/null || true;
+		awk -i inplace '!/vbmeta_vendor \\/' *.mk &>/dev/null || true;
 		sed -i 's/vbmeta_system//' *.mk &>/dev/null || true;
+		sed -i 's/vbmeta_vendor//' *.mk &>/dev/null || true;
 		sed -i '/\/system /{s|avb=vbmeta_system|avb=vbmeta|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
 		sed -i '/\/system_ext/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
 		sed -i '/\/system_ext/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
 		sed -i '/\/vendor/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
 		sed -i '/\/vendor/{s|avb=vbmeta_vendor|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
 		sed -i '/\/vendor/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
-		sed -i '/\/pvmfw/{s|avb=pvmfw|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
-		sed -i '/\/boot/{s|avb=boot|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
-		sed -i '/\/init_boot/{s|avb=init_boot|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
+		#sed -i '/\/pvmfw/{s|avb=pvmfw|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
+		#sed -i '/\/boot/{s|avb=boot|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
+		#sed -i '/\/init_boot/{s|avb=init_boot|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
 		sed -i '/\/product/{s|avb=vbmeta_system|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
 		sed -i '/\/product/{s|avb=vbmeta|avb|}' *fstab* */*fstab* */*/*fstab* &>/dev/null || true;
 		#TODO: remove avb_keys=.*?
diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh
index c94e131d..4f63e029 100644
--- a/Scripts/LineageOS-20.0/Functions.sh
+++ b/Scripts/LineageOS-20.0/Functions.sh
@@ -87,11 +87,11 @@ buildAll() {
 	buildDevice bonito avb;
 	buildDevice sargo avb;
 	#Tensor
-	#buildDevice oriole avb;
-	#buildDevice raven avb;
-	#buildDevice bluejay avb;
-	#buildDevice panther avb;
-	#buildDevice cheetah avb;
+	buildDevice oriole avb;
+	buildDevice raven avb;
+	buildDevice bluejay avb;
+	buildDevice panther avb;
+	buildDevice cheetah avb;
 }
 export -f buildAll;
 
diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh
index 77ed9642..52941fd4 100644
--- a/Scripts/LineageOS-20.0/Patch.sh
+++ b/Scripts/LineageOS-20.0/Patch.sh
@@ -410,6 +410,15 @@ fi;
 #
 #START OF DEVICE CHANGES
 #
+if enterAndClear "device/google/gs101"; then
+sed -i '/Virtualization/,+7d' device.mk;
+fi;
+
+if enterAndClear "device/google/gs201"; then
+sed -i '/Virtualization/,+1d' device.mk;
+sed -i '/PRODUCT_BUILD_PVMFW_IMAGE/,+2d' device.mk;
+awk -i inplace '!/PRODUCT_PACKAGES/' widevine/device.mk;
+fi;
 
 if enterAndClear "device/google/redbull"; then
 awk -i inplace '!/sctp/' BoardConfig-common.mk modules.load; #fix compile after hardenDefconfig