diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7c26c8e..1cdc245 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -38,9 +38,9 @@ TARGET_2ND_CPU_VARIANT := cortex-a9
 
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := sdm845
-BOARD_USES_RECOVERY_AS_BOOT := true
-TARGET_NO_RECOVERY := true
-TARGET_NO_BOOTLOADER := false
+BOARD_USES_RECOVERY_AS_BOOT := false
+TARGET_NO_RECOVERY := false
+TARGET_NO_BOOTLOADER := true
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 
 # Kernel
diff --git a/prebuilt/Image.gz-dtb b/prebuilt/Image.gz-dtb
index 80a68df..4ae3839 100644
Binary files a/prebuilt/Image.gz-dtb and b/prebuilt/Image.gz-dtb differ
diff --git a/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti b/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti
index 2fece02..81fba0a 100755
Binary files a/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti and b/recovery/root/sbin/android.hardware.gatekeeper@1.0-service-qti differ
diff --git a/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti b/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti
index 722e0f7..6504f06 100755
Binary files a/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti and b/recovery/root/sbin/android.hardware.keymaster@3.0-service-qti differ
diff --git a/recovery/root/sbin/qseecomd b/recovery/root/sbin/qseecomd
index 826af38..ee61287 100755
Binary files a/recovery/root/sbin/qseecomd and b/recovery/root/sbin/qseecomd differ
diff --git a/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so b/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
index 62cb27b..15b1dfe 100644
Binary files a/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so and b/recovery/root/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so differ
diff --git a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so b/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so
index 538d3f9..32ba428 100644
Binary files a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so and b/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so differ
diff --git a/recovery/root/vendor/lib64/hw/bootctrl.sdm845.so b/recovery/root/vendor/lib64/hw/bootctrl.sdm845.so
old mode 100644
new mode 100755
index bdce8d9..2472c00
Binary files a/recovery/root/vendor/lib64/hw/bootctrl.sdm845.so and b/recovery/root/vendor/lib64/hw/bootctrl.sdm845.so differ
diff --git a/recovery/root/vendor/lib64/libQSEEComAPI.so b/recovery/root/vendor/lib64/libQSEEComAPI.so
index 4f1f972..45f4075 100644
Binary files a/recovery/root/vendor/lib64/libQSEEComAPI.so and b/recovery/root/vendor/lib64/libQSEEComAPI.so differ
diff --git a/recovery/root/vendor/lib64/libdiag.so b/recovery/root/vendor/lib64/libdiag.so
index dd7b1f6..7668de8 100644
Binary files a/recovery/root/vendor/lib64/libdiag.so and b/recovery/root/vendor/lib64/libdiag.so differ
diff --git a/recovery/root/vendor/lib64/libdrmfs.so b/recovery/root/vendor/lib64/libdrmfs.so
index f8c173e..9527889 100644
Binary files a/recovery/root/vendor/lib64/libdrmfs.so and b/recovery/root/vendor/lib64/libdrmfs.so differ
diff --git a/recovery/root/vendor/lib64/libdrmtime.so b/recovery/root/vendor/lib64/libdrmtime.so
index 3da0b45..4a99e3c 100644
Binary files a/recovery/root/vendor/lib64/libdrmtime.so and b/recovery/root/vendor/lib64/libdrmtime.so differ
diff --git a/recovery/root/vendor/lib64/libkeymasterdeviceutils.so b/recovery/root/vendor/lib64/libkeymasterdeviceutils.so
index 10cb34d..293dd95 100644
Binary files a/recovery/root/vendor/lib64/libkeymasterdeviceutils.so and b/recovery/root/vendor/lib64/libkeymasterdeviceutils.so differ
diff --git a/recovery/root/vendor/lib64/libqisl.so b/recovery/root/vendor/lib64/libqisl.so
index f40d281..f0fff15 100644
Binary files a/recovery/root/vendor/lib64/libqisl.so and b/recovery/root/vendor/lib64/libqisl.so differ
diff --git a/recovery/root/vendor/lib64/librpmb.so b/recovery/root/vendor/lib64/librpmb.so
index 195f6c0..b00897e 100644
Binary files a/recovery/root/vendor/lib64/librpmb.so and b/recovery/root/vendor/lib64/librpmb.so differ
diff --git a/recovery/root/vendor/lib64/libssd.so b/recovery/root/vendor/lib64/libssd.so
index 3e1b7f4..56b2719 100644
Binary files a/recovery/root/vendor/lib64/libssd.so and b/recovery/root/vendor/lib64/libssd.so differ
diff --git a/recovery/root/vendor/lib64/libtime_genoff.so b/recovery/root/vendor/lib64/libtime_genoff.so
index ad2a2cf..1fbf85c 100644
Binary files a/recovery/root/vendor/lib64/libtime_genoff.so and b/recovery/root/vendor/lib64/libtime_genoff.so differ