diff --git a/caiman/rro_overlays/NfcOverlay/res/values/config.xml b/caiman/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from caiman/rro_overlays/NfcOverlay/res/values/config.xml
rename to caiman/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/caiman/rro_overlays/NfcOverlay/Android.bp b/caiman/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index c0982559..00000000
--- a/caiman/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_caimito_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayCaiman",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/caiman/rro_overlays/NfcOverlay/AndroidManifest.xml b/caiman/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4a..00000000
--- a/caiman/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
--->
-<!-- Pixel specific nfc overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.nfc.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.nfc"
-      android:targetName="NfcCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/caiman/rro_overlays/NfcOverlay/OWNERS b/caiman/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713f..00000000
--- a/caiman/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
diff --git a/device-caiman.mk b/device-caiman.mk
index a97a6597..06e77141 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -67,8 +67,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	com.android.nfcservices \
 	Tag \
-	android.hardware.nfc-service.st \
-	NfcOverlayCaiman
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index 7d9ea847..2e9b6f22 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -78,8 +78,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	com.android.nfcservices \
 	Tag \
-	android.hardware.nfc-service.st \
-	NfcOverlayKomodo
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-tokay.mk b/device-tokay.mk
index 218c726d..0681f98f 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -72,8 +72,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	com.android.nfcservices \
 	Tag \
-	android.hardware.nfc-service.st \
-	NfcOverlayTokay
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/komodo/rro_overlays/NfcOverlay/res/values/config.xml b/komodo/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from komodo/rro_overlays/NfcOverlay/res/values/config.xml
rename to komodo/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/komodo/rro_overlays/NfcOverlay/Android.bp b/komodo/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 8e19ae4b..00000000
--- a/komodo/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_caimito_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayKomodo",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/komodo/rro_overlays/NfcOverlay/AndroidManifest.xml b/komodo/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4a..00000000
--- a/komodo/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
--->
-<!-- Pixel specific nfc overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.nfc.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.nfc"
-      android:targetName="NfcCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/komodo/rro_overlays/NfcOverlay/OWNERS b/komodo/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713f..00000000
--- a/komodo/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
diff --git a/tokay/rro_overlays/NfcOverlay/res/values/config.xml b/tokay/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from tokay/rro_overlays/NfcOverlay/res/values/config.xml
rename to tokay/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/tokay/rro_overlays/NfcOverlay/Android.bp b/tokay/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 187416bf..00000000
--- a/tokay/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_caimito_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayTokay",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/tokay/rro_overlays/NfcOverlay/AndroidManifest.xml b/tokay/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4a..00000000
--- a/tokay/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
--->
-<!-- Pixel specific nfc overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.nfc.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.nfc"
-      android:targetName="NfcCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/tokay/rro_overlays/NfcOverlay/OWNERS b/tokay/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713f..00000000
--- a/tokay/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS