diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5903101b..d3d12a8a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -156,7 +156,7 @@ jobs:
       - run: npx cap update
       - run: npx cap copy
       - run: cd android && gradle bundle
-      - run: cd android && ./gradlew assembleRelease
+      - run: cd android && ./gradlew assembleRelease --stacktrace
       # optimize apk
       - run: cd android/app/build/outputs/apk/release && zipalign 4 app-release-unsigned.apk app-release-unsigned-zip.apk
       # sign apk
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 680977c9..71cab2c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## [0.5.8](https://github.com/plebbit/seedit/compare/v0.5.7...v0.5.8) (2025-08-09)
+
+
+### Bug Fixes
+
+* **android:** implement cross-platform account export ([b0b06db](https://github.com/plebbit/seedit/commit/b0b06db8c55b3e6bb6c1148acbc61d7ddf6c2d2c))
+* edit comment state would get stuck at pending ([4251325](https://github.com/plebbit/seedit/commit/4251325b2a131bd64e5b8e8c8f1df20d7c20f581))
+* resolve Android export dialog and permission issues ([01d7e1c](https://github.com/plebbit/seedit/commit/01d7e1c209d9899ea13502d70f6cf75786b5ec2c))
+
+
+
 ## [0.5.7](https://github.com/plebbit/seedit/compare/v0.5.6...v0.5.7) (2025-08-06)
 
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 061753ce..0ae65d82 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -58,9 +58,12 @@ apply from: 'capacitor.build.gradle'
 
 try {
     def servicesJSON = file('google-services.json')
-    if (servicesJSON.text) {
+    if (servicesJSON.exists() && servicesJSON.text) {
         apply plugin: 'com.google.gms.google-services'
+        logger.info("google-services.json found, applying Google Services plugin")
+    } else {
+        logger.info("google-services.json not found or empty, Google Services plugin not applied. Push Notifications won't work")
     }
 } catch(Exception e) {
-    logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
+    logger.info("Error checking google-services.json: ${e.message}. Google Services plugin not applied")
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 6981f3c9..20728a62 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -26,6 +26,3 @@ android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 android.suppressUnsupportedCompileSdk=35
-
-# Force Gradle to use Java 17 for all operations
-org.gradle.java.home=/opt/homebrew/Cellar/openjdk@17/17.0.16/libexec/openjdk.jdk/Contents/Home
diff --git a/package.json b/package.json
index 65e35820..2eb5a8d3 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Seedit",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "A GUI for plebbit similar to old.reddit",
   "author": "Plebbit Labs",
   "type": "module",