diff --git a/GmsCore/Android.bp b/GmsCore/Android.bp
index 67a28a9ce60641069af8940b6b363ef952d58f95..02f5243b897468f9be170e70d57ec997aa08515c 100644
--- a/GmsCore/Android.bp
+++ b/GmsCore/Android.bp
@@ -15,7 +15,7 @@ android_app_import {
     certificate: "platform",
     overrides: ["com.qualcomm.location"],
     required: [
-        "e_GmsCoreFrameworksBaseOverlay",
+        "e_FrameworksBaseOverlay",
         "privapp-permissions-com.google.android.gms.xml",
         "microg.xml",
     ],
diff --git a/Passwords/Android.bp b/Passwords/Android.bp
index e4d6f178482a549e18138801b178d926d05051d3..5724df4b8d4600bed8bd335c14e5f9f07aafc8ae 100644
--- a/Passwords/Android.bp
+++ b/Passwords/Android.bp
@@ -4,7 +4,7 @@ android_app_import {
     apk: "app-universal-release.apk",
     system_ext_specific: true,
     required: [
-        "e_PasswordsFrameworksBaseOverlay",
+        "e_FrameworksBaseOverlay",
     ],
     optional_uses_libs: [
       "androidx.window.extensions",
diff --git a/Passwords/rro_overlays/PasswordAppBaseOverlay/Android.bp b/Passwords/rro_overlays/PasswordAppBaseOverlay/Android.bp
deleted file mode 100644
index d5f4724af50a5c6e7d0275f2723891d352665971..0000000000000000000000000000000000000000
--- a/Passwords/rro_overlays/PasswordAppBaseOverlay/Android.bp
+++ /dev/null
@@ -1,8 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-runtime_resource_overlay {
-    name: "e_PasswordsFrameworksBaseOverlay",
-    product_specific: true,
-}
diff --git a/Passwords/rro_overlays/PasswordAppBaseOverlay/AndroidManifest.xml b/Passwords/rro_overlays/PasswordAppBaseOverlay/AndroidManifest.xml
deleted file mode 100644
index 4da9b720567ca3ab52c6aa07fe05b703d80db13c..0000000000000000000000000000000000000000
--- a/Passwords/rro_overlays/PasswordAppBaseOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="foundation.e.passwords.frameworksbaseoverlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <application android:hasCode="false" />
-
-    <overlay 
-        android:targetPackage="android"
-        android:priority="0"
-        android:isStatic="true" />
-</manifest>
diff --git a/Passwords/rro_overlays/PasswordAppBaseOverlay/res/values/config.xml b/Passwords/rro_overlays/PasswordAppBaseOverlay/res/values/config.xml
deleted file mode 100644
index 3e7baadbd43d946db40f1ab17c262261ca070c14..0000000000000000000000000000000000000000
--- a/Passwords/rro_overlays/PasswordAppBaseOverlay/res/values/config.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_defaultAutofillService" translatable="false">foundation.e.passwords/com.hegocre.nextcloudpasswords.services.autofill.NCPAutofillService</string>
-</resources>
diff --git a/GmsCore/rro_overlays/GmsCoreFrameworksBaseOverlay/Android.bp b/rro_overlays/FrameworksBaseOverlay/Android.bp
similarity index 83%
rename from GmsCore/rro_overlays/GmsCoreFrameworksBaseOverlay/Android.bp
rename to rro_overlays/FrameworksBaseOverlay/Android.bp
index 87618b5d2c175cbf1f6974874b512b6b59079d28..c0e5d99b4480ec526cbbe3d7b6e72930df876563 100644
--- a/GmsCore/rro_overlays/GmsCoreFrameworksBaseOverlay/Android.bp
+++ b/rro_overlays/FrameworksBaseOverlay/Android.bp
@@ -8,6 +8,6 @@ package {
 }
 
 runtime_resource_overlay {
-    name: "e_GmsCoreFrameworksBaseOverlay",
+    name: "e_FrameworksBaseOverlay",
     product_specific: true,
 }
diff --git a/GmsCore/rro_overlays/GmsCoreFrameworksBaseOverlay/AndroidManifest.xml b/rro_overlays/FrameworksBaseOverlay/AndroidManifest.xml
similarity index 89%
rename from GmsCore/rro_overlays/GmsCoreFrameworksBaseOverlay/AndroidManifest.xml
rename to rro_overlays/FrameworksBaseOverlay/AndroidManifest.xml
index 424bf31735d459701e2ab133a616eb9071e3a6bd..c882d9a38a750e4298df8548de197c4319d8b78c 100644
--- a/GmsCore/rro_overlays/GmsCoreFrameworksBaseOverlay/AndroidManifest.xml
+++ b/rro_overlays/FrameworksBaseOverlay/AndroidManifest.xml
@@ -4,7 +4,7 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.gms.frameworksbaseoverlay"
+    package="foundation.e.frameworksbaseoverlay"
     android:versionCode="1"
     android:versionName="1.0">
 
diff --git a/GmsCore/rro_overlays/GmsCoreFrameworksBaseOverlay/res/values/config.xml b/rro_overlays/FrameworksBaseOverlay/res/values/config.xml
similarity index 57%
rename from GmsCore/rro_overlays/GmsCoreFrameworksBaseOverlay/res/values/config.xml
rename to rro_overlays/FrameworksBaseOverlay/res/values/config.xml
index e8e11106530e1531ae95e50944159f0d907a07ea..d6fa7e0164d3e4c60609a35bbfc0d68b288ee251 100644
--- a/GmsCore/rro_overlays/GmsCoreFrameworksBaseOverlay/res/values/config.xml
+++ b/rro_overlays/FrameworksBaseOverlay/res/values/config.xml
@@ -4,11 +4,14 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
-    <!-- microG credential provider -->
+    <string name="config_defaultAutofillService" translatable="false">foundation.e.passwords/com.hegocre.nextcloudpasswords.services.autofill.NCPAutofillService</string>
+    <!-- Passwords and microG credential provider -->
     <string-array name="config_enabledCredentialProviderService" translatable="false">
+        <item>foundation.e.passwords/com.hegocre.nextcloudpasswords.services.autofill.NCPCredentialProviderService</item>
         <item>com.google.android.gms/com.google.android.gms.auth.api.credentials.credman.service.PasswordAndPasskeyService</item>
     </string-array>
     <string-array name="config_primaryCredentialProviderService" translatable="false">
+        <item>foundation.e.passwords/com.hegocre.nextcloudpasswords.services.autofill.NCPCredentialProviderService</item>
         <item>com.google.android.gms/com.google.android.gms.auth.api.credentials.credman.service.PasswordAndPasskeyService</item>
     </string-array>
 </resources>