diff --git a/.github/workflows/test-keystore-clean.yml b/.github/workflows/test-keystore-apk-signing.yml
similarity index 98%
rename from .github/workflows/test-keystore-clean.yml
rename to .github/workflows/test-keystore-apk-signing.yml
index 9933c03..efd5cfe 100644
--- a/.github/workflows/test-keystore-clean.yml
+++ b/.github/workflows/test-keystore-apk-signing.yml
@@ -1,4 +1,4 @@
-name: Test Keystore Configuration
+name: Test APK Signing Using Keystore
 
 # This workflow tests the production keystore configuration to ensure it works properly
 # with the Android build system. It validates that the keystore can be decoded, passwords
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  test-keystore:
+  test-apk-signing:
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/test-keystore.yml b/.github/workflows/test-keystore.yml
index a0c9fea..2b757ae 100644
--- a/.github/workflows/test-keystore.yml
+++ b/.github/workflows/test-keystore.yml
@@ -1,11 +1,17 @@
-name: Test Keystore Configuration
+name: Keystore Diagnostics and Testing
 
-# This workflow is solely for testing that the keystore configuration works
-# It can be triggered manually to verify that:
-# 1. The base64 keystore decodes properly
-# 2. The keystore password works
-# 3. The key alias exists in the keystore
-# 4. The key password works
+# This workflow provides comprehensive keystore diagnostics and testing
+# It can be triggered manually to verify and troubleshoot keystore configuration:
+# 1. Base64 keystore decoding and validation
+# 2. Keystore password verification
+# 3. Key alias existence and accessibility
+# 4. Key password validation
+# 5. Keystore type detection (JKS, PKCS12, JCEKS)
+# 6. File signing capability testing with jarsigner
+# 7. Private key accessibility analysis
+# 8. Comparison with working debug keystore
+# 9. Multiple signing approach testing
+# 10. Comprehensive error diagnostics and artifact collection
 
 on:
   # Manual trigger only - run this to test your keystore configuration
@@ -218,14 +224,6 @@ jobs:
           echo "Excluded keystores from artifacts for security"
           ls -la keystore-test-artifacts/
 
-      - name: Upload Diagnostic Files
-        if: always()  # Run even if previous steps failed
-        uses: actions/upload-artifact@v4
-        with:
-          name: keystore-diagnostic-files
-          path: keystore-test-artifacts/
-          retention-days: 1  # Only keep for a day since it contains diagnostic info
-
       - name: Debug Secret Values (Redacted)
         run: |
           echo "Debugging secret configuration (values redacted for security):"
@@ -412,3 +410,11 @@ jobs:
               cat keystore-test/signing-newpass.txt
             fi
           fi
+
+      - name: Upload Diagnostic Files
+        if: always()  # Run even if previous steps failed
+        uses: actions/upload-artifact@v4
+        with:
+          name: keystore-diagnostic-files
+          path: keystore-test-artifacts/
+          retention-days: 1  # Only keep for a day since it contains diagnostic info