diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 268948990..f1be226dc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -158,10 +158,9 @@ android {
             } else {
                 signingConfig = signingConfigs.getByName("debug")
             }
-            productFlavors.getByName("fdroid") {
-                isMinifyEnabled = false
-                isShrinkResources = false
-            }
+            isMinifyEnabled = true
+            isShrinkResources = true
+            isDebuggable = false
         }
     }
     bundle { language { enableSplit = false } }
diff --git a/core/model/consumer-rules.pro b/core/model/consumer-rules.pro
new file mode 100644
index 000000000..5f75d687d
--- /dev/null
+++ b/core/model/consumer-rules.pro
@@ -0,0 +1,2 @@
+-keep class org.meshtastic.core.model.DataPacket
+-keep class org.meshtastic.core.model.DataPacket$CREATOR
diff --git a/core/proto/consumer-rules.pro b/core/proto/consumer-rules.pro
new file mode 100644
index 000000000..92c60d123
--- /dev/null
+++ b/core/proto/consumer-rules.pro
@@ -0,0 +1,6 @@
+-keep class org.meshtastic.proto.MeshProtos$DeviceMetadata
+-keep class org.meshtastic.proto.MeshProtos$FromRadio
+-keep class org.meshtastic.proto.MeshProtos$Position
+-keep class org.meshtastic.proto.MeshProtos$User
+-keep class org.meshtastic.proto.PaxcountProtos$Paxcount
+-keep class org.meshtastic.proto.TelemetryProtos$Telemetry