diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index dd7d6e245f..b928ca63ad 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -370,6 +370,8 @@ jobs:
         || [ "${{toJSON(inputs.lts)}}" = "true" ]; then
           echo "full=true" >> $GITHUB_ENV
           echo "upload=server" >> $GITHUB_ENV
+        elif [ "${{env.skip}}" != "true" ]; then
+          echo "partial=true" >> $GITHUB_ENV
         fi
 
     - uses: actions/checkout@v3
@@ -447,7 +449,7 @@ jobs:
       run: arm-none-eabi-gcc -v
 
     - name: Configs Set SSH variables
-      if: ${{ env.skip != 'true' }}
+      if: ${{ env.full == 'true' && env.upload == 'server' }}
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
       run: |
@@ -457,12 +459,12 @@ jobs:
 
     # Build rusEFI console
     - name: Build console
-      if: ${{ env.skip != 'true' }}
+      if: ${{ env.full == 'true' }}
       run: bash misc/jenkins/build_java_console.sh
 
     # Build the simulator
     - name: Build simulator
-      if: ${{ env.skip != 'true' }}
+      if: ${{ env.full == 'true' }}
       # 'OS="Windows_NT"' allows us to build Windows executable on unix
       run: OS="Windows_NT" bash misc/jenkins/build_simulator.sh
 
@@ -488,47 +490,47 @@ jobs:
         prerelease: true
 
     - name: Upload .ini files
-      if: ${{ env.skip != 'true' }}
+      if: ${{ env.full == 'true' }}
       working-directory: ./firmware/tunerstudio/generated
       run: ../upload_ini.sh ${{matrix.ini-file}} ${{ secrets.RUSEFI_ONLINE_FTP_USER }} ${{ secrets.RUSEFI_ONLINE_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
 
     - name: Upload build elf
-      if: ${{ env.skip != 'true' }}
+      if: ${{ env.partial == 'true' }}
       uses: actions/upload-artifact@v3
       with:
         name: rusefi_${{matrix.build-target}}.elf
         path: ./firmware/build/rusefi.elf
 
     - name: Upload build bin
-      if: ${{ env.skip != 'true' }}
+      if: ${{ env.partial == 'true' }}
       uses: actions/upload-artifact@v3
       with:
         name: rusefi_${{matrix.build-target}}.bin
         path: ./firmware/deliver/rusefi*.bin
 
     - name: Upload build hex
-      if: ${{ env.skip != 'true' }}
+      if: ${{ env.partial == 'true' }}
       uses: actions/upload-artifact@v3
       with:
         name: rusefi_${{matrix.build-target}}.hex
         path: ./firmware/deliver/rusefi*.hex
 
     - name: Upload build dfu
-      if: ${{ env.skip != 'true' }}
+      if: ${{ env.partial == 'true' }}
       uses: actions/upload-artifact@v3
       with:
         name: rusefi_${{matrix.build-target}}.dfu
         path: ./firmware/deliver/rusefi*.dfu
 
     - name: Upload bundle
-      if: ${{ env.skip != 'true' }}
+      if: ${{ env.full == 'true' }}
       uses: actions/upload-artifact@v3
       with:
         name: rusefi_bundle_${{matrix.build-target}}.zip
         path: ./artifacts/rusefi_bundle*.zip
 
     - name: Upload autoupdate bundle
-      if: ${{ env.skip != 'true' }}
+      if: ${{ env.full == 'true' }}
       uses: actions/upload-artifact@v3
       with:
         name: rusefi_bundle_${{matrix.build-target}}_autoupdate.zip