diff --git a/.github/workflows/frontend-admin-build.yml b/.github/workflows/frontend-admin-build.yml
index 9580578a..6fc86f6f 100644
--- a/.github/workflows/frontend-admin-build.yml
+++ b/.github/workflows/frontend-admin-build.yml
@@ -53,6 +53,8 @@ jobs:
                     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 "xavia_url=https://ota-prod.uber-stup.club"        >> $GITHUB_OUTPUT
+                    echo "xavia_key=${{ secrets.XAVIA_KEY_ADMIN_PROD }}"    >> $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
@@ -60,6 +62,8 @@ jobs:
                     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 "xavia_url=https://ota-preprod.uber-stup.club"     >> $GITHUB_OUTPUT
+                    echo "xavia_key=${{ secrets.XAVIA_KEY_ADMIN_PREPROD }}" >> $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 +87,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: ${{ steps.config.outputs.xavia_url }}
                   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"
@@ -118,14 +122,14 @@ jobs:
               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_UPDATE_URL: ${{ steps.config.outputs.xavia_url }}
                   NODE_OPTIONS: "--max-old-space-size=2048"
               run: |
                   RUNTIME_VERSION=$(jq -r '.expo.version' app.json)
                   npx expo export --platform android --output-dir dist
                   cd dist && zip -r ../bundle.zip . && cd ..
-                  curl -X POST "${{ secrets.XAVIA_API_URL }}/api/upload" \
-                    -H "Authorization: Bearer ${{ secrets.XAVIA_API_KEY }}" \
+                  curl -X POST "${{ steps.config.outputs.xavia_url }}/api/upload" \
+                    -H "Authorization: Bearer ${{ steps.config.outputs.xavia_key }}" \
                     -F "file=@bundle.zip" \
                     -F "runtimeVersion=$RUNTIME_VERSION" \
                     -F "channel=${{ steps.config.outputs.channel }}" \
diff --git a/.github/workflows/frontend-client-build.yml b/.github/workflows/frontend-client-build.yml
index dca47004..e067f3ee 100644
--- a/.github/workflows/frontend-client-build.yml
+++ b/.github/workflows/frontend-client-build.yml
@@ -53,6 +53,8 @@ jobs:
                     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 "xavia_url=https://ota-mobile-prod.uber-stup.club" >> $GITHUB_OUTPUT
+                    echo "xavia_key=${{ secrets.XAVIA_KEY_MOBILE_PROD }}"   >> $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
@@ -60,6 +62,8 @@ jobs:
                     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 "xavia_url=https://ota-mobile-preprod.uber-stup.club" >> $GITHUB_OUTPUT
+                    echo "xavia_key=${{ secrets.XAVIA_KEY_MOBILE_PREPROD }}"   >> $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 +87,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: ${{ steps.config.outputs.xavia_url }}
                   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"
@@ -118,14 +122,14 @@ jobs:
               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_UPDATE_URL: ${{ steps.config.outputs.xavia_url }}
                   NODE_OPTIONS: "--max-old-space-size=2048"
               run: |
                   RUNTIME_VERSION=$(jq -r '.expo.version' app.json)
                   npx expo export --platform android --output-dir dist
                   cd dist && zip -r ../bundle.zip . && cd ..
-                  curl -X POST "${{ secrets.XAVIA_API_URL }}/api/upload" \
-                    -H "Authorization: Bearer ${{ secrets.XAVIA_API_KEY }}" \
+                  curl -X POST "${{ steps.config.outputs.xavia_url }}/api/upload" \
+                    -H "Authorization: Bearer ${{ steps.config.outputs.xavia_key }}" \
                     -F "file=@bundle.zip" \
                     -F "runtimeVersion=$RUNTIME_VERSION" \
                     -F "channel=${{ steps.config.outputs.channel }}" \