diff --git a/.github/workflows/firebase-app-distribution.yml b/.github/workflows/firebase-app-distribution.yml
index 10424e0..6a81df1 100644
--- a/.github/workflows/firebase-app-distribution.yml
+++ b/.github/workflows/firebase-app-distribution.yml
@@ -66,6 +66,16 @@ jobs:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
         run: |
+          if [ -z "$KEYSTORE_PATH" ]; then
+            echo "Missing KEYSTORE_PATH environment variable."
+            exit 1
+          fi
+
+          if [ ! -f "$KEYSTORE_PATH" ]; then
+            echo "Keystore file was not created at $KEYSTORE_PATH."
+            exit 1
+          fi
+
           for secret_name in KEYSTORE_PASSWORD KEY_ALIAS KEY_PASSWORD; do
             if [ -z "${!secret_name}" ]; then
               echo "Missing $secret_name repository secret."
@@ -73,10 +83,15 @@ jobs:
             fi
           done
 
-          keytool -list \
+          if ! keytool -list \
             -keystore "$KEYSTORE_PATH" \
             -storepass "$KEYSTORE_PASSWORD" \
-            -alias "$KEY_ALIAS" > /dev/null
+            -alias "$KEY_ALIAS" > /dev/null; then
+            echo "Could not read the release key from the keystore."
+            echo "Check KEYSTORE_BASE, KEYSTORE_PASSWORD and KEY_ALIAS."
+            echo "If your key password is different from the store password, also check KEY_PASSWORD."
+            exit 1
+          fi
 
       - name: Set app version
         run: |
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index da392b7..d34eb97 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,7 +48,7 @@ android {
 
     buildTypes {
         debug {
-            buildConfigField("String", "BASE_URL", "\"http://10.0.2.2:8080/api/v1/\"")
+            buildConfigField("String", "BASE_URL", "\"http://20.124.135.239/api/v1/\"")
         }
         create("docker") {
             initWith(getByName("debug"))
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index eb7159c..45f8108 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -2,5 +2,6 @@
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">10.0.2.2</domain>
+        <domain includeSubdomains="true">20.124.135.239</domain>
     </domain-config>
 </network-security-config>
\ No newline at end of file