diff --git a/.github/workflows/frontend-admin-build-local.yml b/.github/workflows/frontend-admin-build-local.yml
index 9580578a..608a4fe8 100644
--- a/.github/workflows/frontend-admin-build-local.yml
+++ b/.github/workflows/frontend-admin-build-local.yml
@@ -52,14 +52,12 @@ jobs:
                     echo "profile=production"                                >> $GITHUB_OUTPUT
                     echo "channel=production-admin"                         >> $GITHUB_OUTPUT
                     echo "api_url=${{ secrets.PROD_API_URL }}"              >> $GITHUB_OUTPUT
-                    echo "ota_api_url=https://mln-uber.club"                >> $GITHUB_OUTPUT
                     echo "apk_name=admin-panel-production-$(date +%Y%m%d-%H%M).apk" >> $GITHUB_OUTPUT
                     echo "message=Production update $(date +%Y%m%d-%H%M)"  >> $GITHUB_OUTPUT
                   else
                     echo "profile=pre-prod"                                 >> $GITHUB_OUTPUT
                     echo "channel=pre-prod-admin"                           >> $GITHUB_OUTPUT
                     echo "api_url=${{ secrets.PREPROD_API_URL }}"           >> $GITHUB_OUTPUT
-                    echo "ota_api_url=https://5.181.0.112.nip.io"           >> $GITHUB_OUTPUT
                     echo "apk_name=admin-panel-pre-prod-$(date +%Y%m%d-%H%M).apk" >> $GITHUB_OUTPUT
                     echo "message=Pre-prod update $(date +%Y%m%d-%H%M)"    >> $GITHUB_OUTPUT
                   fi
@@ -83,7 +81,7 @@ jobs:
               env:
                   EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
                   EXPO_PUBLIC_API_URL: ${{ steps.config.outputs.api_url }}
-                  EXPO_PUBLIC_UPDATE_URL: ${{ secrets.XAVIA_API_URL }}
+                  EXPO_PUBLIC_UPDATE_URL: ${{ secrets.XAVIA_API_URL }}/api/manifest
                   EAS_BUILD_NO_EXPO_GO_WARNING: true
                   NODE_OPTIONS: "--max-old-space-size=2048"
                   GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2"
@@ -117,15 +115,16 @@ jobs:
               working-directory: frontend-admin
               env:
                   EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
-                  EXPO_PUBLIC_API_URL: ${{ steps.config.outputs.ota_api_url }}
-                  EXPO_PUBLIC_UPDATE_URL: ${{ secrets.XAVIA_API_URL }}
+                  EXPO_PUBLIC_API_URL: ${{ steps.config.outputs.api_url }}
+                  EXPO_PUBLIC_UPDATE_URL: ${{ secrets.XAVIA_API_URL }}/api/manifest
                   NODE_OPTIONS: "--max-old-space-size=2048"
               run: |
                   RUNTIME_VERSION=$(jq -r '.expo.version' app.json)
                   npx expo export --platform android --output-dir dist
+                  jq '.expo' app.json > dist/expoconfig.json
                   cd dist && zip -r ../bundle.zip . && cd ..
                   curl -X POST "${{ secrets.XAVIA_API_URL }}/api/upload" \
-                    -H "Authorization: Bearer ${{ secrets.XAVIA_API_KEY }}" \
+                    -F "uploadKey=${{ secrets.XAVIA_UPLOAD_KEY }}" \
                     -F "file=@bundle.zip" \
                     -F "runtimeVersion=$RUNTIME_VERSION" \
                     -F "channel=${{ steps.config.outputs.channel }}" \
diff --git a/.github/workflows/frontend-client-build-local.yml b/.github/workflows/frontend-client-build-local.yml
index dca47004..82f34be3 100644
--- a/.github/workflows/frontend-client-build-local.yml
+++ b/.github/workflows/frontend-client-build-local.yml
@@ -52,14 +52,12 @@ jobs:
                     echo "profile=production"                                >> $GITHUB_OUTPUT
                     echo "channel=production-client"                        >> $GITHUB_OUTPUT
                     echo "api_url=${{ secrets.PROD_API_URL }}"              >> $GITHUB_OUTPUT
-                    echo "ota_api_url=${{ secrets.PROD_API_URL }}"          >> $GITHUB_OUTPUT
                     echo "apk_name=mobile-production-$(date +%Y%m%d-%H%M).apk" >> $GITHUB_OUTPUT
                     echo "message=Production update $(date +%Y%m%d-%H%M)"  >> $GITHUB_OUTPUT
                   else
                     echo "profile=pre-prod"                                 >> $GITHUB_OUTPUT
                     echo "channel=pre-prod-client"                          >> $GITHUB_OUTPUT
                     echo "api_url=${{ secrets.PREPROD_API_URL }}"           >> $GITHUB_OUTPUT
-                    echo "ota_api_url=${{ secrets.PREPROD_API_URL }}"       >> $GITHUB_OUTPUT
                     echo "apk_name=mobile-pre-prod-$(date +%Y%m%d-%H%M).apk" >> $GITHUB_OUTPUT
                     echo "message=Pre-prod update $(date +%Y%m%d-%H%M)"    >> $GITHUB_OUTPUT
                   fi
@@ -83,7 +81,7 @@ jobs:
               env:
                   EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
                   EXPO_PUBLIC_API_URL: ${{ steps.config.outputs.api_url }}
-                  EXPO_PUBLIC_UPDATE_URL: ${{ secrets.XAVIA_API_URL }}
+                  EXPO_PUBLIC_UPDATE_URL: ${{ secrets.XAVIA_API_URL }}/api/manifest
                   EAS_BUILD_NO_EXPO_GO_WARNING: true
                   NODE_OPTIONS: "--max-old-space-size=2048"
                   GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2"
@@ -117,15 +115,16 @@ jobs:
               working-directory: mobile
               env:
                   EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
-                  EXPO_PUBLIC_API_URL: ${{ steps.config.outputs.ota_api_url }}
-                  EXPO_PUBLIC_UPDATE_URL: ${{ secrets.XAVIA_API_URL }}
+                  EXPO_PUBLIC_API_URL: ${{ steps.config.outputs.api_url }}
+                  EXPO_PUBLIC_UPDATE_URL: ${{ secrets.XAVIA_API_URL }}/api/manifest
                   NODE_OPTIONS: "--max-old-space-size=2048"
               run: |
                   RUNTIME_VERSION=$(jq -r '.expo.version' app.json)
                   npx expo export --platform android --output-dir dist
+                  jq '.expo' app.json > dist/expoconfig.json
                   cd dist && zip -r ../bundle.zip . && cd ..
                   curl -X POST "${{ secrets.XAVIA_API_URL }}/api/upload" \
-                    -H "Authorization: Bearer ${{ secrets.XAVIA_API_KEY }}" \
+                    -F "uploadKey=${{ secrets.XAVIA_UPLOAD_KEY }}" \
                     -F "file=@bundle.zip" \
                     -F "runtimeVersion=$RUNTIME_VERSION" \
                     -F "channel=${{ steps.config.outputs.channel }}" \