diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml
index 34f051ce6f..0f611d9dfa 100644
--- a/.github/workflows/build-android.yaml
+++ b/.github/workflows/build-android.yaml
@@ -21,17 +21,31 @@ jobs:
         env:
           RUSEFI_ANDROID_KEYPASS: ${{ secrets.RUSEFI_ANDROID_KEYPASS }}
         working-directory: ./android
-        run: bash ./gradlew build
+        run: |
+          if [ "${{github.event_name}}" == "push" ]; then
+            bash ./gradlew build
+          else
+            bash ./gradlew bundleDebug
+          fi
 
-      - name: Upload APK
+      - name: Upload APK - release
+        if: ${{ github.event_name == 'push' }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: rusEFI-release
+          path: ./android/app/build/outputs/apk/release/rusEFI-release.apk
+
+      - name: Upload APK - unsigned
+        if: ${{ github.event_name != 'push' }}
         uses: actions/upload-artifact@v2
         with:
           name: rusEFI-release-unsigned
-          path: ./android/app/build/outputs/apk/release/rusEFI-release.apk
+          path: ./android/app/build/outputs/bundle/debug/rusEFI-debug.aab
 
       - name: Install Tools
         run: sudo apt-get install ncftp
 
       - name: Upload rusEFI Android application
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
         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.apk
diff --git a/.github/workflows/build-simulator.yaml b/.github/workflows/build-simulator.yaml
index fee3ba184c..1976ab4e46 100644
--- a/.github/workflows/build-simulator.yaml
+++ b/.github/workflows/build-simulator.yaml
@@ -19,7 +19,7 @@ jobs:
 
     - name: Compile Simulator
       working-directory: ./simulator/
-      run: sh compile.sh
+      run: bash compile.sh
 
     - name: Upload built simulator
       uses: actions/upload-artifact@v2
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7d815f5888..43f4261679 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -36,6 +36,9 @@ android {
     }
 
     buildTypes {
+	debug {
+	    minifyEnabled false
+	}
         release {
             minifyEnabled false
             signingConfig signingConfigs.release
diff --git a/simulator/compile.sh b/simulator/compile.sh
index ab4db04d75..7858d49289 100644
--- a/simulator/compile.sh
+++ b/simulator/compile.sh
@@ -1,4 +1,5 @@
 rm -f build/rusefi_simulator.exe
 make -j4 -r
+[ $? -eq 0 ] || { echo "Simulator compilation failed"; exit 1; }
 file build/rusefi_simulator
 echo "TIMESTAMP $(date "+%D %T.%2N") just compiled rusefi simulator"