diff --git a/Android.bp b/Android.bp
index 2091a90..7cedfb7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -98,6 +98,7 @@
 aconfig_declarations {
     name: "avf_aconfig_flags",
     package: "com.android.system.virtualmachine.flags",
+    container: "com.android.virt",
     srcs: [
         "avf_flags.aconfig",
     ],
diff --git a/avf_flags.aconfig b/avf_flags.aconfig
index 589d227..a5260a9 100644
--- a/avf_flags.aconfig
+++ b/avf_flags.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.system.virtualmachine.flags"
+container: "com.android.virt"
 
 flag {
   name: "avf_v_test_apis"