diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags
index cf6951233e237..6352f81b44745 100644
--- a/packages/SystemUI/proguard.flags
+++ b/packages/SystemUI/proguard.flags
@@ -1,16 +1,22 @@
 # Preserve line number information for debugging stack traces.
 -keepattributes SourceFile,LineNumberTable
 
+-keep class com.android.systemui.recents.OverviewProxyRecentsImpl
+-keep class com.android.systemui.statusbar.car.CarStatusBar
+-keep class com.android.systemui.statusbar.phone.StatusBar
+-keep class com.android.systemui.statusbar.tv.TvStatusBar
 -keep class com.android.systemui.car.CarSystemUIFactory
 -keep class com.android.systemui.SystemUIFactory
 -keep class com.android.systemui.tv.TvSystemUIFactory
+-keep class * extends com.android.systemui.CoreStartable
+-keep class * implements com.android.systemui.CoreStartable$Injector
 
 -keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet);
 }
 
 -keep class ** extends androidx.preference.PreferenceFragment
-
+-keep class com.android.systemui.tuner.*
 -keep class com.android.systemui.plugins.** {
     *;
 }
@@ -19,6 +25,10 @@
 }
 -keep class androidx.core.app.CoreComponentFactory
 
+-keep public class * extends com.android.systemui.CoreStartable {
+    public <init>(android.content.Context);
+}
+
 # Keep the wm shell lib
 -keep class com.android.wm.shell.*
 # Keep the protolog group methods that are called by the generated code
@@ -26,6 +36,11 @@
     *;
 }
 
+-keep,allowoptimization,allowaccessmodification class com.android.systemui.dagger.GlobalRootComponent { !synthetic *; }
+-keep,allowoptimization,allowaccessmodification class com.android.systemui.dagger.GlobalRootComponent$SysUIComponentImpl { !synthetic *; }
+-keep,allowoptimization,allowaccessmodification class com.android.systemui.dagger.Dagger** { !synthetic *; }
+-keep,allowoptimization,allowaccessmodification class com.android.systemui.tv.Dagger** { !synthetic *; }
+
 # Allows proguard to make private and protected methods and fields public as
 # part of optimization. This lets proguard inline trivial getter/setter methods.
 -allowaccessmodification