diff --git a/arch/arm/boot/dts/qcom/msm8996-auto.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto.dtsi
index ba075694d8c9..7dd486618cde 100644
--- a/arch/arm/boot/dts/qcom/msm8996-auto.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto.dtsi
@@ -11,7 +11,11 @@
  */
 
 &android_vendor {
-	fsmgr_flags = "wait,slotselect,verify";
+	fsmgr_flags = "wait,slotselect,avb";
+};
+
+&android_vbmeta {
+	parts = "vbmeta,boot,system,vendor,dtbo";
 };
 
 &peripheral_mem {
diff --git a/arch/arm/boot/dts/qcom/msm8996.dtsi b/arch/arm/boot/dts/qcom/msm8996.dtsi
index 593b227d540f..62abceb7b5b1 100644
--- a/arch/arm/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996.dtsi
@@ -186,7 +186,7 @@
 	firmware: firmware {
 		android {
 			compatible = "android,firmware";
-			vbmeta {
+			android_vbmeta: vbmeta {
 				compatible = "android,vbmeta";
 				parts = "vbmeta,boot,system,vendor,dtbo,recovery";
 			};
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi b/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi
index 262f8397d975..b9ae88fa8865 100644
--- a/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996pro-auto.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -18,7 +18,7 @@
 			fstab {
 				/delete-node/ system;
 				vendor {
-					fsmgr_flags = "wait,slotselect,verify";
+					fsmgr_flags = "wait,slotselect,avb";
 					status = "ok";
 				};
 			};