diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f4628a778..cfaea33f9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -35,7 +35,7 @@ android {
             applicationIdSuffix = ".release"
 
             postprocessing {
-                isRemoveUnusedCode = false
+                isRemoveUnusedCode = true
                 isObfuscate = false
                 isOptimizeCode = false
             }
diff --git a/g-services/build.gradle.kts b/g-services/build.gradle.kts
index 2071681b1..01518a9ef 100644
--- a/g-services/build.gradle.kts
+++ b/g-services/build.gradle.kts
@@ -20,6 +20,7 @@ android {
                     getDefaultProguardFile("proguard-android-optimize.txt"),
                     "proguard-rules.pro"
             )
+            consumerProguardFiles("proguard-rules.pro")
         }
     }
 
diff --git a/g-services/proguard-rules.pro b/g-services/proguard-rules.pro
index ff59496d8..42c526107 100644
--- a/g-services/proguard-rules.pro
+++ b/g-services/proguard-rules.pro
@@ -18,4 +18,6 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+
+-keep class com.google.** { *; }
\ No newline at end of file
diff --git a/ms-services/build.gradle.kts b/ms-services/build.gradle.kts
index b21251412..3905a10db 100644
--- a/ms-services/build.gradle.kts
+++ b/ms-services/build.gradle.kts
@@ -20,6 +20,7 @@ android {
                     getDefaultProguardFile("proguard-android-optimize.txt"),
                     "proguard-rules.pro"
             )
+            consumerProguardFile("proguard-rules.pro")
         }
     }
 
diff --git a/ms-services/proguard-rules.pro b/ms-services/proguard-rules.pro
index 01639a198..10cb249f0 100644
--- a/ms-services/proguard-rules.pro
+++ b/ms-services/proguard-rules.pro
@@ -18,4 +18,6 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+
+-keep class com.microsoft.graph.requests.** { *; }
\ No newline at end of file