diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 4f55e8b3bd4e47e70c971bfe1cf901d5723d15dd..4954cb4821200181229f7552205c17aef623ec14 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -165,7 +165,6 @@ android_library {
         "SystemUISharedLib",
         "SystemUI-statsd",
         "SettingsLib",
-        "com_android_systemui_communal_flags_lib",
         "com_android_systemui_flags_lib",
         "androidx.core_core-ktx",
         "androidx.viewpager2_viewpager2",
diff --git a/packages/SystemUI/aconfig/Android.bp b/packages/SystemUI/aconfig/Android.bp
index b18c7900a1686f648976ab404961da4b3d289a6e..dc4208e8720741d17b48a54139cc456c8617a800 100644
--- a/packages/SystemUI/aconfig/Android.bp
+++ b/packages/SystemUI/aconfig/Android.bp
@@ -2,8 +2,7 @@ aconfig_declarations {
     name: "com_android_systemui_flags",
     package: "com.android.systemui",
     srcs: [
-        "systemui.aconfig",
-        "accessibility.aconfig",
+        "*.aconfig",
     ],
 }
 
@@ -11,16 +10,3 @@ java_aconfig_library {
     name: "com_android_systemui_flags_lib",
     aconfig_declarations: "com_android_systemui_flags",
 }
-
-aconfig_declarations {
-    name: "com_android_systemui_communal_flags",
-    package: "com.android.systemui.communal",
-    srcs: [
-        "communal.aconfig",
-    ],
-}
-
-java_aconfig_library {
-    name: "com_android_systemui_communal_flags_lib",
-    aconfig_declarations: "com_android_systemui_communal_flags",
-}
diff --git a/packages/SystemUI/aconfig/communal.aconfig b/packages/SystemUI/aconfig/communal.aconfig
index 8ecb9842ddc52a5440e4407a164b69cde853bbcb..2c6ff979cc7ff05a8d81b7137e9dc7e926f1ad10 100644
--- a/packages/SystemUI/aconfig/communal.aconfig
+++ b/packages/SystemUI/aconfig/communal.aconfig
@@ -1,4 +1,4 @@
-package: "com.android.systemui.communal"
+package: "com.android.systemui"
 
 flag {
     name: "communal_hub"