diff --git a/app/proguard-rules-release.pro b/app/proguard-rules-release.pro
index e69de29..5d7204e 100644
--- a/app/proguard-rules-release.pro
+++ b/app/proguard-rules-release.pro
@@ -0,0 +1,3 @@
+-keepclassmembers class * implements androidx.viewbinding.ViewBinding {
+    *;
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/convention.android.base.gradle.kts b/buildSrc/src/main/kotlin/convention.android.base.gradle.kts
index 8ccf7be..89c6afb 100644
--- a/buildSrc/src/main/kotlin/convention.android.base.gradle.kts
+++ b/buildSrc/src/main/kotlin/convention.android.base.gradle.kts
@@ -151,8 +151,8 @@ fun Project.addCompose(flavor: ProductFlavor, options: ComposeOptions.() -> Unit
                 "${taskNamePrefix}KotlinAndroid",
             )
 
-            project.tasks.whenTaskAdded {
-                if (name !in possibleTaskNames) return@whenTaskAdded
+            project.tasks.configureEach {
+                if (name !in possibleTaskNames) return@configureEach
 
                 addComposeArgsToKotlinCompile(
                     this as KotlinCompile,