diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index 198c24d..c1afd6a 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -6,7 +6,7 @@
 aconfig_declarations {
     name: "aconfig_settings_flags",
     package: "com.android.settings.flags",
-    container: "system_ext",
+    container: "system",
     srcs: [
         "*.aconfig",
     ],
@@ -20,7 +20,7 @@
 aconfig_declarations {
     name: "factory_reset_flags",
     package: "com.android.settings.factory_reset",
-    container: "system_ext",
+    container: "system",
     srcs: ["factory_reset/*.aconfig"],
 }
 
@@ -32,7 +32,7 @@
 aconfig_declarations {
     name: "media_drm_flags",
     package: "com.android.settings.media_drm",
-    container: "system_ext",
+    container: "system",
     srcs: ["media_drm/*.aconfig"],
 }
 
@@ -44,7 +44,7 @@
 aconfig_declarations {
     name: "accessibility_flags",
     package: "com.android.settings.accessibility",
-    container: "system_ext",
+    container: "system",
     srcs: ["accessibility/*.aconfig"],
 }
 
@@ -56,7 +56,7 @@
 aconfig_declarations {
     name: "development_settings_flags",
     package: "com.android.settings.development",
-    container: "system_ext",
+    container: "system",
     srcs: [
         "development/**/*.aconfig",
     ],
@@ -70,7 +70,7 @@
 aconfig_declarations {
     name: "keyboard_flags",
     package: "com.android.settings.keyboard",
-    container: "system_ext",
+    container: "system",
     srcs: ["keyboard/*.aconfig"],
 }