diff --git a/.github/workflows/build-beta-desktop.yml b/.github/workflows/build-beta-desktop.yml
index 13b1b58bf6..70b52a3bfa 100644
--- a/.github/workflows/build-beta-desktop.yml
+++ b/.github/workflows/build-beta-desktop.yml
@@ -12,7 +12,7 @@ jobs:
 
     name: Find desktop variants
     runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'Armbian' }}
+    if: ${{ github.repository_owner == 'Armbian' && github.event.workflow_run.conclusion == 'success' }} || github.event_name == 'workflow_dispatch'
     outputs:
       matrix: ${{steps.list_dirs.outputs.matrix}}
     steps:
@@ -130,4 +130,4 @@ jobs:
         run: |
 
           sudo apt-get -y -qq install lftp          
-          lftp -u upload, -e "set net:timeout 10;set net:max-retries 16;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --include-glob=armbian-${{ env.RELEASE }}-desktop-${{ env.DE }}_*.deb  --no-perms $(pwd)/build/output/debs-beta/ debs-beta/ ;bye" sftp://users.armbian.com
\ No newline at end of file
+          lftp -u upload, -e "set net:timeout 10;set net:max-retries 16;mirror --Remove-source-files -R --no-empty-dirs --parallel=8 --include-glob=armbian-${{ env.RELEASE }}-desktop-${{ env.DE }}_*.deb  --no-perms $(pwd)/build/output/debs-beta/ debs-beta/ ;bye" sftp://users.armbian.com
diff --git a/.github/workflows/build-cache.yml b/.github/workflows/build-cache.yml
index 485f9431d3..94fe6e77b8 100644
--- a/.github/workflows/build-cache.yml
+++ b/.github/workflows/build-cache.yml
@@ -30,6 +30,7 @@ jobs:
 
     with:
       rootfsarch: 'bananapi'
+      runner: 'small'
       branch: ${{ github.event.inputs.branch }}
 
     secrets:  
@@ -45,6 +46,7 @@ jobs:
 
     with:
       rootfsarch: 'lepotato'
+      runner: 'small'
       branch: ${{ github.event.inputs.branch }}
 
     secrets:
@@ -60,6 +62,7 @@ jobs:
     with:
 
       rootfsarch: 'uefi-x86'
+      runner: 'x64'
       branch: ${{ github.event.inputs.branch }}
 
     secrets:
diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml
index 558b75f490..bb982fbe9c 100644
--- a/.github/workflows/build-test-image-docker.yml
+++ b/.github/workflows/build-test-image-docker.yml
@@ -22,7 +22,7 @@ jobs:
         board: [uefi-arm64,uefi-x86,virtual-qemu]
         release: [focal,buster,bullseye,hirsute,jammy]
         desktop: [xfce]
-    if: ${{ github.repository_owner == 'Armbian' }}
+    if: ${{ github.repository_owner == 'Armbian' && github.event.workflow_run.conclusion == 'success' }} || github.event_name == 'workflow_dispatch'
     name: Variant
     runs-on: ubuntu-latest    
     steps: