diff --git a/Passwords/Android.bp b/Passwords/Android.bp
index 3ad42a30828bfda21ff4e9fed74ead5192960a72..e4d6f178482a549e18138801b178d926d05051d3 100644
--- a/Passwords/Android.bp
+++ b/Passwords/Android.bp
@@ -3,6 +3,9 @@ android_app_import {
     certificate: "platform",
     apk: "app-universal-release.apk",
     system_ext_specific: true,
+    required: [
+        "e_PasswordsFrameworksBaseOverlay",
+    ],
     optional_uses_libs: [
       "androidx.window.extensions",
       "androidx.window.sidecar",
diff --git a/Passwords/rro_overlays/PasswordAppBaseOverlay/Android.bp b/Passwords/rro_overlays/PasswordAppBaseOverlay/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..d5f4724af50a5c6e7d0275f2723891d352665971
--- /dev/null
+++ b/Passwords/rro_overlays/PasswordAppBaseOverlay/Android.bp
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000..4da9b720567ca3ab52c6aa07fe05b703d80db13c
--- /dev/null
+++ b/Passwords/rro_overlays/PasswordAppBaseOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?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
new file mode 100644
index 0000000000000000000000000000000000000000..3e7baadbd43d946db40f1ab17c262261ca070c14
--- /dev/null
+++ b/Passwords/rro_overlays/PasswordAppBaseOverlay/res/values/config.xml
@@ -0,0 +1,4 @@
+<?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>