diff --git a/Platform/EFI_Binaries b/Platform/EFI_Binaries
index b2bc46d898..d097b8a8bf 160000
--- a/Platform/EFI_Binaries
+++ b/Platform/EFI_Binaries
@@ -1 +1 @@
-Subproject commit b2bc46d8989ca713e7dd8c9adf3214048e7a8801
+Subproject commit d097b8a8bf3641e5e0c8b36ef1ac9d7cc1a0bd94
diff --git a/Platform/Oneplus/sm8150/AcpiTables/guacamoleb/DSDT.aml b/Platform/Oneplus/sm8150/AcpiTables/guacamoleb/DSDT.aml
index 7e15aa363e..6ab98c29cc 100644
Binary files a/Platform/Oneplus/sm8150/AcpiTables/guacamoleb/DSDT.aml and b/Platform/Oneplus/sm8150/AcpiTables/guacamoleb/DSDT.aml differ
diff --git a/Platform/Oneplus/sm8150/FdtBlob_compat/guacamoleb.dtb b/Platform/Oneplus/sm8150/FdtBlob_compat/guacamoleb.dtb
index 6c9dd6bdd6..110e16a9a9 100644
Binary files a/Platform/Oneplus/sm8150/FdtBlob_compat/guacamoleb.dtb and b/Platform/Oneplus/sm8150/FdtBlob_compat/guacamoleb.dtb differ
diff --git a/Platform/Oneplus/sm8150/guacamoleb.dsc b/Platform/Oneplus/sm8150/guacamoleb.dsc
index 7b6f6008c2..ad9bee1e7a 100644
--- a/Platform/Oneplus/sm8150/guacamoleb.dsc
+++ b/Platform/Oneplus/sm8150/guacamoleb.dsc
@@ -10,11 +10,13 @@
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = Platform/Qualcomm/sm8150/sm8150.fdf
   DEVICE_DXE_FV_COMPONENTS       = Platform/Oneplus/sm8150/guacamoleb.fdf.inc
+  # Enable A/B Slot Environment
+  AB_SLOTS_SUPPORT               = TRUE
 
 !include Platform/Qualcomm/sm8150/sm8150.dsc
 
 [BuildOptions.common]
-  GCC:*_*_AARCH64_CC_FLAGS = -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
+  GCC:*_*_AARCH64_CC_FLAGS = -DAB_SLOTS_SUPPORT=1 -DENABLE_SIMPLE_INIT -DENABLE_LINUX_SIMPLE_MASS_STORAGE
 
 [PcdsFixedAtBuild.common]
   gQcomTokenSpaceGuid.PcdMipiFrameBufferWidth|1080
diff --git a/Platform/Oneplus/sm8150/guacamoleb.fdf.inc b/Platform/Oneplus/sm8150/guacamoleb.fdf.inc
index d0a8fa15b3..a3df9c8af4 100644
--- a/Platform/Oneplus/sm8150/guacamoleb.fdf.inc
+++ b/Platform/Oneplus/sm8150/guacamoleb.fdf.inc
@@ -1,26 +1,26 @@
-// per-device BSP DXEs (use from op7 pro)
+// per-device BSP DXEs
 FILE DRIVER = 8e9bd160-b184-11df-94e2-0800200c9a66 {
 	SECTION DXE_DEPEX = Platform/EFI_Binaries/Drivers/sm8150/DALSys/DALSys.depex
-	SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamole/DALSys/DALSys.efi
+	SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamoleb/DALSys/DALSys.efi
 	SECTION UI = "DALSys"
 }
 
 FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
   	SECTION DXE_DEPEX = Platform/EFI_Binaries/Drivers/sm8150/ButtonsDxe/ButtonsDxe.depex
-  	SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamole/ButtonsDxe/ButtonsDxe.efi
+  	SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamoleb/ButtonsDxe/ButtonsDxe.efi
   	SECTION UI = "ButtonsDxe"
 }
 
 FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
-    SECTION DXE_DEPEX = Platform/EFI_Binaries/Drivers/sm8150/WP_Binaries/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
-	SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamole/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
-    SECTION UI = "UsbPwrCtrlDxe"
+  	SECTION DXE_DEPEX = Platform/EFI_Binaries/Drivers/sm8150/WP_Binaries/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
+  	SECTION PE32 = Platform/EFI_Binaries/Drivers/Devices/guacamoleb/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
+  	SECTION UI = "UsbPwrCtrlDxe"
 }
 
-// ACPI Tables (use from op7 pro)
+// ACPI Tables
 FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
 # 	Customized DSDT
-  	SECTION RAW = Platform/Oneplus/sm8150/AcpiTables/guacamole/DSDT.aml
+  	SECTION RAW = Platform/Oneplus/sm8150/AcpiTables/guacamoleb/DSDT.aml
 # 	Common Tables
 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/APIC.aml
 # 	SECTION RAW = Silicon/Qualcomm/sm8150/AcpiTables/BuiltIn/BERT.aml
@@ -39,7 +39,7 @@ FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
 	SECTION UI = "AcpiTables"
 }
 
-// Mainline device tree blob (use from sm-8150 mainlane - https://gitlab.com/sm8150-mainline/linux/-/blob/sm8150/5.17/arch/arm64/boot/dts/qcom/sm8150-oneplus-hotdogb.dts)
+// Mainline device tree blob (use from sm-8150 mainline - https://gitlab.com/sm8150-mainline/linux/-/blob/sm8150/5.17/arch/arm64/boot/dts/qcom/sm8150-oneplus-hotdogb.dts)
 FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
   SECTION RAW = Platform/Oneplus/sm8150/FdtBlob/sm8150-oneplus-hotdogb.dtb
 }
diff --git a/configs/devices/guacamoleb.conf b/configs/devices/guacamoleb.conf
index 280f002ef0..0d479cb745 100644
--- a/configs/devices/guacamoleb.conf
+++ b/configs/devices/guacamoleb.conf
@@ -3,6 +3,6 @@ VENDOR_NAME="Oneplus"
 PLATFORM_NAME="guacamoleb"
 
 # mkbootimg config
-BOOTIMG_OS_PATCH_LEVEL="2022-12"
-BOOTIMG_OS_VERSION=13.0.0
+BOOTIMG_OS_PATCH_LEVEL="2021-01"
+BOOTIMG_OS_VERSION=10.0.0
 BOOTIMG_HEADER_VERSION=1