diff --git a/caiman/overlay/packages/apps/Nfc/res/values/config.xml b/caiman/overlay/packages/apps/Nfc/res/values/config.xml
new file mode 100644
index 00000000..5058cfa5
--- /dev/null
+++ b/caiman/overlay/packages/apps/Nfc/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="nfcc_always_on_allowed">false</bool>
+  <bool name="polling_disable_allowed">true</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>GR83Y</item>
+    <item>GEC77</item>
+    <item>GWVK6</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+</resources>
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index c2203cfc..0e061514 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -70,16 +70,13 @@ PRODUCT_PACKAGES += \
 
 # SecureElement
 PRODUCT_PACKAGES += \
-	android.hardware.secure_element@1.2-service-gto
+	android.hardware.secure_element-service.thales
 
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \
 	frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \
 	device/google/caimito/nfc/libse-gto-hal-disable.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
 
-DEVICE_MANIFEST_FILE += \
-	device/google/caimito/nfc/manifest_se.xml
-
 # Bluetooth HAL
 PRODUCT_COPY_FILES += \
 	device/google/caimito/bluetooth/bt_vendor_overlay_ripcurrent24.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
diff --git a/komodo/overlay/packages/apps/Nfc/res/values/config.xml b/komodo/overlay/packages/apps/Nfc/res/values/config.xml
new file mode 100644
index 00000000..265f2c9a
--- /dev/null
+++ b/komodo/overlay/packages/apps/Nfc/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="nfcc_always_on_allowed">false</bool>
+  <bool name="polling_disable_allowed">true</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>GGX8B</item>
+    <item>GQ57S</item>
+    <item>GZC4K</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+</resources>
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index 2700a20b..442e785e 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -147,6 +147,12 @@ DEFAULT_ISODEP_ROUTE=0x00
 # disable 0x00 default value
 STNFC_CONTROL_CLK=0x00
 
+###############################################################################
+# Configure the Field on timer
+# enable  0x01
+# disable 0x00 default value
+STNFC_REMOTE_FIELD_TIMER=0x01
+
 ###############################################################################
 # Configure the ACTIVE_RW timer
 # Default 0x00, set 0x01 to enable it
diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf
index 3940b1f5..be65f66d 100644
--- a/nfc/libnfc-nci.conf
+++ b/nfc/libnfc-nci.conf
@@ -118,4 +118,4 @@ RECOVERY_OPTION=1
 # NFCEE Power Supply and Communication Link Control Configuration
 # Set when SetAlwaysOn enabled
 # Default 0x00 when SetAlways on disabled
-ALWAYS_ON_SET_EE_POWER_AND_LINK_CONF=0x03
+ALWAYS_ON_SET_EE_POWER_AND_LINK_CONF=0x00
diff --git a/tokay/overlay/packages/apps/Nfc/res/values/config.xml b/tokay/overlay/packages/apps/Nfc/res/values/config.xml
new file mode 100644
index 00000000..5d908286
--- /dev/null
+++ b/tokay/overlay/packages/apps/Nfc/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="nfcc_always_on_allowed">false</bool>
+  <bool name="polling_disable_allowed">true</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>G2YBB</item>
+    <item>GUR25</item>
+    <item>G1B60</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+</resources>