diff --git a/aconfig/catalyst/accessibility.aconfig b/aconfig/catalyst/accessibility.aconfig
index 7837067..fe0d7a5 100644
--- a/aconfig/catalyst/accessibility.aconfig
+++ b/aconfig/catalyst/accessibility.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "catalyst_accessibility_color_and_motion"
diff --git a/aconfig/catalyst/battery.aconfig b/aconfig/catalyst/battery.aconfig
index cec40f3..7c152d9 100644
--- a/aconfig/catalyst/battery.aconfig
+++ b/aconfig/catalyst/battery.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "catalyst_power_usage_summary_screen"
diff --git a/aconfig/catalyst/connected_devices.aconfig b/aconfig/catalyst/connected_devices.aconfig
index 7a335fa..5b7a70b 100644
--- a/aconfig/catalyst/connected_devices.aconfig
+++ b/aconfig/catalyst/connected_devices.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "catalyst_bluetooth_switchbar_screen"
diff --git a/aconfig/catalyst/display.aconfig b/aconfig/catalyst/display.aconfig
index 9485e70..11c1d3a 100644
--- a/aconfig/catalyst/display.aconfig
+++ b/aconfig/catalyst/display.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "catalyst_display_settings_screen"
diff --git a/aconfig/catalyst/location.aconfig b/aconfig/catalyst/location.aconfig
index c656bf3..24f2c53 100644
--- a/aconfig/catalyst/location.aconfig
+++ b/aconfig/catalyst/location.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "catalyst_location_settings"
diff --git a/aconfig/catalyst/lockscreen.aconfig b/aconfig/catalyst/lockscreen.aconfig
index 9a84f66..280171a 100644
--- a/aconfig/catalyst/lockscreen.aconfig
+++ b/aconfig/catalyst/lockscreen.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "catalyst_lockscreen_from_display_settings"
diff --git a/aconfig/catalyst/network_and_internet.aconfig b/aconfig/catalyst/network_and_internet.aconfig
index aa26ce4..e39b182 100644
--- a/aconfig/catalyst/network_and_internet.aconfig
+++ b/aconfig/catalyst/network_and_internet.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "catalyst_network_provider_and_internet_screen"
diff --git a/aconfig/catalyst/sound_screen.aconfig b/aconfig/catalyst/sound_screen.aconfig
index ac7f8bc..1eacc3a 100644
--- a/aconfig/catalyst/sound_screen.aconfig
+++ b/aconfig/catalyst/sound_screen.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "catalyst_sound_screen"
diff --git a/aconfig/catalyst/system.aconfig b/aconfig/catalyst/system.aconfig
index f87ff44..4cd1cd9 100644
--- a/aconfig/catalyst/system.aconfig
+++ b/aconfig/catalyst/system.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "catalyst_language_setting"
diff --git a/aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig b/aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig
index 18684ab..79e9ddc 100644
--- a/aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig
+++ b/aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.keyboard"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "keyboard_layout_picker_activity_enabled"