diff --git a/bsp_diff/caas/device/intel/mixins/0030-Revert-Fix-for-Factory-Reset-and-Screen-lock-not-wor.patch b/bsp_diff/caas/device/intel/mixins/0030-Revert-Fix-for-Factory-Reset-and-Screen-lock-not-wor.patch
new file mode 100644
index 0000000..3668901
--- /dev/null
+++ b/bsp_diff/caas/device/intel/mixins/0030-Revert-Fix-for-Factory-Reset-and-Screen-lock-not-wor.patch
@@ -0,0 +1,44 @@
+From e8fcb5452b499c44df1ad1e854d9d805d2ae4a08 Mon Sep 17 00:00:00 2001
+From: celadon <celadon@intel.com>
+Date: Thu, 11 Dec 2025 04:22:08 +0000
+Subject: [PATCH] Revert "Fix for Factory Reset and Screen lock not working
+ after trusty"
+
+This reverts commit 43d7e17a0417112ce0a0be7d9046c8afa7cd0902.
+
+Tracked-On: OAM-134836
+Signed-off-by: Avinash Kumar <avinash3.kumar@intel.com>
+---
+ groups/tee/trusty/product.mk | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/groups/tee/trusty/product.mk b/groups/tee/trusty/product.mk
+index f7914945..ee8b4b0c 100644
+--- a/groups/tee/trusty/product.mk
++++ b/groups/tee/trusty/product.mk
+@@ -4,9 +4,8 @@ PRODUCT_PACKAGES += \
+ 	storageproxyd \
+ 	libinteltrustystorage \
+ 	libinteltrustystorageinterface \
+-	android.hardware.gatekeeper-service.nonsecure \
+-	com.android.hardware.gatekeeper.nonsecure \
+-        android.hardware.security.keymint-service \
++	android.hardware.gatekeeper-service.trusty \
++	android.hardware.security.keymint-service.trusty \
+ 	keybox_provisioning \
+ 	RemoteProvisioner \
+ 	rpmb_dev
+@@ -19,6 +18,10 @@ PRODUCT_PACKAGES_DEBUG += \
+ 	RemoteProvisionerUnitTests \
+ 	libkeymint_remote_prov_support_test
+ 
++PRODUCT_PROPERTY_OVERRIDES += \
++	ro.hardware.gatekeeper=trusty \
++	ro.hardware.keystore=trusty
++
+ PRODUCT_COPY_FILES += \
+ 	frameworks/native/data/etc/android.hardware.keystore.app_attest_key.xml:vendor/etc/permissions/android.hardware.keystore.app_attest_key.xml
+ 
+-- 
+2.34.1
+
diff --git a/bsp_diff/caas/device/intel/sepolicy/0004-Revert-Fix-AVC-denial-for-the-software-Gatekeeper.patch b/bsp_diff/caas/device/intel/sepolicy/0004-Revert-Fix-AVC-denial-for-the-software-Gatekeeper.patch
new file mode 100644
index 0000000..63b6f08
--- /dev/null
+++ b/bsp_diff/caas/device/intel/sepolicy/0004-Revert-Fix-AVC-denial-for-the-software-Gatekeeper.patch
@@ -0,0 +1,34 @@
+From 318972d17895b5ba3123e76926d2aa13095f1e10 Mon Sep 17 00:00:00 2001
+From: celadon <celadon@intel.com>
+Date: Thu, 11 Dec 2025 04:18:18 +0000
+Subject: [PATCH] Revert "Fix AVC denial for the software Gatekeeper"
+
+This reverts commit 977e58218d53412adaef9eca9f2d9de945c25d11.
+
+Tracked-On: OAM-134836
+Signed-off-by: Avinash Kumar <avinash3.kumar@intel.com>
+---
+ tee/trusty/hal_gatekeeper_default.te | 2 --
+ tee/trusty/service_contexts          | 1 -
+ 2 files changed, 3 deletions(-)
+ delete mode 100644 tee/trusty/hal_gatekeeper_default.te
+ delete mode 100644 tee/trusty/service_contexts
+
+diff --git a/tee/trusty/hal_gatekeeper_default.te b/tee/trusty/hal_gatekeeper_default.te
+deleted file mode 100644
+index 0181578..0000000
+--- a/tee/trusty/hal_gatekeeper_default.te
++++ /dev/null
+@@ -1,2 +0,0 @@
+-hal_attribute_service(hal_gatekeeper, hal_gatekeeper_service)
+-allow hal_gatekeeper_default hal_gatekeeper_service:service_manager add;
+diff --git a/tee/trusty/service_contexts b/tee/trusty/service_contexts
+deleted file mode 100644
+index 434e1fc..0000000
+--- a/tee/trusty/service_contexts
++++ /dev/null
+@@ -1 +0,0 @@
+-android.hardware.security.sharedsecret.ISharedSecret/gatekeeper                      u:object_r:hal_gatekeeper_service:s0
+-- 
+2.34.1
+