diff --git a/target/product/base_system_ext.mk b/target/product/base_system_ext.mk
index df859cd4c..6847bfa40 100644
--- a/target/product/base_system_ext.mk
+++ b/target/product/base_system_ext.mk
@@ -16,3 +16,5 @@
 
 # Base modules and settings for the system_ext partition.
 PRODUCT_PACKAGES += \
+    group_system_ext \
+    passwd_system_ext \
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 1657e7112..c49aab7c2 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -49,7 +49,6 @@ PRODUCT_PACKAGES += \
     fs_config_dirs_nonsystem \
     gralloc.default \
     group_odm \
-    group_system_ext \
     group_vendor \
     init_vendor \
     libbundlewrapper \
@@ -65,7 +64,6 @@ PRODUCT_PACKAGES += \
     libril \
     libvisualizer \
     passwd_odm \
-    passwd_system_ext \
     passwd_vendor \
     selinux_policy_nonsystem \
     shell_and_utilities_vendor \