diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 83635918a..9f744b580 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -57,5 +57,14 @@
 -if interface * { @retrofit2.http.* <methods>; }
 -keep,allowobfuscation interface <1>
 
+# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
+-keep,allowobfuscation,allowshrinking interface retrofit2.Call
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
+
+# With R8 full mode generic signatures are stripped for classes that are not
+# kept. Suspend functions are wrapped in continuations where the type argument
+# is used.
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
 -dontwarn
 -ignorewarnings
diff --git a/buildSrc/src/main/java/MyApp.kt b/buildSrc/src/main/java/MyApp.kt
index b16a4df3a..c3d30ffd5 100644
--- a/buildSrc/src/main/java/MyApp.kt
+++ b/buildSrc/src/main/java/MyApp.kt
@@ -2,6 +2,6 @@
 
 object MyApp {
     const val appId = "dev.jahir.blueprint.app"
-    const val version = 236
-    const val versionName = "2.3.6"
+    const val version = 237
+    const val versionName = "2.3.7"
 }
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
index 088b39176..e105912f1 100644
--- a/buildSrc/src/main/java/Versions.kt
+++ b/buildSrc/src/main/java/Versions.kt
@@ -2,9 +2,9 @@
 
 object Versions {
     // Plugins
-    const val gradle = "8.0.1"
+    const val gradle = "8.1.0"
     const val kotlin = "1.9.0"
-    const val ksp = "$kotlin-1.0.11"
+    const val ksp = "$kotlin-1.0.12"
 
     // OneSignal
     const val oneSignal = "4.8.6"
@@ -15,5 +15,5 @@ object Versions {
     const val buildTools = "33.0.2"
 
     // Blueprint
-    const val blueprint = "2.3.6"
+    const val blueprint = "2.3.7"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 108ebd768..78d74b754 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Jul 24 22:47:34 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME