diff --git a/flags/Android.bp b/flags/Android.bp
index 8f363b6..4646649 100644
--- a/flags/Android.bp
+++ b/flags/Android.bp
@@ -21,6 +21,7 @@
 aconfig_declarations {
     name: "telephony_flags",
     package: "com.android.internal.telephony.flags",
+    container: "system",
     srcs: [
         "calling.aconfig",
         "data.aconfig",
diff --git a/flags/calling.aconfig b/flags/calling.aconfig
index bdd0844..f121169 100644
--- a/flags/calling.aconfig
+++ b/flags/calling.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=breadley TARGET=24Q3
 flag {
diff --git a/flags/data.aconfig b/flags/data.aconfig
index fbd8508..b93c48e 100644
--- a/flags/data.aconfig
+++ b/flags/data.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=linggm TARGET=24Q3
 flag {
diff --git a/flags/domainselection.aconfig b/flags/domainselection.aconfig
index 3bf5898..623c3b6 100644
--- a/flags/domainselection.aconfig
+++ b/flags/domainselection.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=forestchoi TARGET=24Q3
 flag {
diff --git a/flags/ims.aconfig b/flags/ims.aconfig
index 4dbd8aa..b4f3101 100644
--- a/flags/ims.aconfig
+++ b/flags/ims.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=hyosunkim TARGET=24Q2
 flag {
diff --git a/flags/iwlan.aconfig b/flags/iwlan.aconfig
index 702e3f1..f16ee38 100644
--- a/flags/iwlan.aconfig
+++ b/flags/iwlan.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=jmunikrishna TARGET=24Q3
 flag {
diff --git a/flags/messaging.aconfig b/flags/messaging.aconfig
index 57cfdb4..45df2d8 100644
--- a/flags/messaging.aconfig
+++ b/flags/messaging.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=linggm TARGET=24Q1
 flag {
diff --git a/flags/misc.aconfig b/flags/misc.aconfig
index f5e9f6f..114b5ed 100644
--- a/flags/misc.aconfig
+++ b/flags/misc.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=tjstuart TARGET=24Q3
 flag {
diff --git a/flags/network.aconfig b/flags/network.aconfig
index 7587be9..eae58d0 100644
--- a/flags/network.aconfig
+++ b/flags/network.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=nharold TARGET=24Q1
 flag {
diff --git a/flags/satellite.aconfig b/flags/satellite.aconfig
index d9f1498..27ab0b1 100644
--- a/flags/satellite.aconfig
+++ b/flags/satellite.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=amallampati TARGET=24Q3
 flag {
diff --git a/flags/subscription.aconfig b/flags/subscription.aconfig
index 5bc5340..60c0af1 100644
--- a/flags/subscription.aconfig
+++ b/flags/subscription.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=linggm TARGET=24Q3
 flag {
diff --git a/flags/telephony.aconfig b/flags/telephony.aconfig
index 91e8cf3..07f2f9e 100644
--- a/flags/telephony.aconfig
+++ b/flags/telephony.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=joonhunshin TARGET=24Q3
 flag {
diff --git a/flags/uicc.aconfig b/flags/uicc.aconfig
index 6576c87..8166853 100644
--- a/flags/uicc.aconfig
+++ b/flags/uicc.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.telephony.flags"
+container: "system"
 
 # OWNER=jayachandranc TARGET=24Q3
 flag {