diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml
index 4fdd690cb7..da4ac9145c 100644
--- a/.github/workflows/build-android.yaml
+++ b/.github/workflows/build-android.yaml
@@ -25,4 +25,8 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: rusEFI-release-unsigned
-          path: ./android/app/build/outputs/apk/release/app-release-unsigned.apk
+          path: ./android/app/build/outputs/apk/release/rusEFI-release-unsigned.apk
+
+      - name: Upload rusEFI Android application
+        working-directory: .
+        run: java_console/upload_server.sh ${{ secrets.RUSEFI_BUILD_FTP_USER }} ${{ secrets.RUSEFI_BUILD_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }} . android/app/build/outputs/apk/release/rusEFI-release-unsigned.apk
diff --git a/.github/workflows/build-rusEFI-console.yaml b/.github/workflows/build-rusEFI-console.yaml
index 376ad20c46..e3f9b9fd29 100644
--- a/.github/workflows/build-rusEFI-console.yaml
+++ b/.github/workflows/build-rusEFI-console.yaml
@@ -32,5 +32,5 @@ jobs:
           path: ./java_console/build/*.txt
 
       - name: Upload rusEFI server
-        working-directory: ./java_console
-        run: ./upload_server.sh ${{ secrets.RUSEFI_BUILD_FTP_USER }} ${{ secrets.RUSEFI_BUILD_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
+        working-directory: .
+        run: java_console/upload_server.sh ${{ secrets.RUSEFI_BUILD_FTP_USER }} ${{ secrets.RUSEFI_BUILD_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }} autoupdate java_console_binary/rusefi_server.jar
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 803dc8af52..d0725c1d65 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -13,6 +13,7 @@ android {
 
     compileSdkVersion 30
     buildToolsVersion "30.0.0"
+    project.archivesBaseName = "rusEFI";
 
     defaultConfig {
         applicationId "com.rusefi.app"
diff --git a/java_console/upload_server.sh b/java_console/upload_server.sh
index 17bdaf3702..5ada48fd5e 100755
--- a/java_console/upload_server.sh
+++ b/java_console/upload_server.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+#
+# we have code duplication with three "upload_xxx*" files
+# todo: clean it up? use this version with five parameters for all use-cases?
+# todo: rename this script since it's a universal one?
+#
 
 if [ ! "$1" ] || [ ! "$2" ] || [ ! "$3" ]; then
  echo "No Secrets"
@@ -8,4 +13,4 @@ fi
 
 echo -e "\nUploading plugin body"
 
-ncftpput -m -R -v -u "$1" -p "$2" "$3" autoupdate ../java_console_binary/rusefi_server.jar
+ncftpput -m -R -v -u "$1" -p "$2" "$3" $4 $5