diff --git a/VCL/build.gradle b/VCL/build.gradle
index 5af440dc..3b3c7899 100644
--- a/VCL/build.gradle
+++ b/VCL/build.gradle
@@ -6,14 +6,14 @@ plugins {
 }
 
 android {
-    compileSdk 35
+    compileSdk 34
     namespace 'io.velocitycareerlabs'
 
     defaultConfig {
         minSdk 24
-        targetSdk 35
-        versionName "2.5.1"
-        versionCode 141
+        targetSdk 34
+        versionName "2.5.2"
+        versionCode 142
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
diff --git a/VCL/src/main/java/io/velocitycareerlabs/impl/data/infrastructure/db/SecretStoreServiceImpl.kt b/VCL/src/main/java/io/velocitycareerlabs/impl/data/infrastructure/db/SecretStoreServiceImpl.kt
index 6e6db906..ef9b19bc 100644
--- a/VCL/src/main/java/io/velocitycareerlabs/impl/data/infrastructure/db/SecretStoreServiceImpl.kt
+++ b/VCL/src/main/java/io/velocitycareerlabs/impl/data/infrastructure/db/SecretStoreServiceImpl.kt
@@ -39,10 +39,7 @@ class SecretStoreServiceImpl(
     }
 
     override fun storeKey(keyId: String, key: JWK) {
-        val isStored = encryptedSharedPreferences.edit().putString(KEY_PREFIX + keyId, key.toJSONString()).commit()
-        if (!isStored) {
-            throw Exception("Failed to store key: keyId: $keyId, key: $key")
-        }
+        encryptedSharedPreferences.edit().putString(KEY_PREFIX + keyId, key.toJSONString()).apply()
     }
 
     override fun retrieveKey(keyId: String): JWK {
diff --git a/app/build.gradle b/app/build.gradle
index 4c60a5d0..35bb346d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,13 +5,13 @@ plugins {
 }
 
 android {
-    compileSdk 35
+    compileSdk 34
 //    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.vcl.wallet"
         minSdk 24
-        targetSdk 35
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/build.gradle b/build.gradle
index 21619ce7..bb90e049 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 331b8762..2eae35a7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip