diff --git a/.github/workflows/build-beta-images.yml b/.github/workflows/build-beta-images.yml
index 61cbc97e6e68..8235a276516f 100644
--- a/.github/workflows/build-beta-images.yml
+++ b/.github/workflows/build-beta-images.yml
@@ -37,7 +37,7 @@ jobs:
     with:
  
       variant: 'cli:beta'
-      runner: "ubuntu-latest"
+      runner: "small"
       part: 1
       of: 1
       include: 'grep uefi-x86 | '
@@ -60,7 +60,7 @@ jobs:
     with:
  
       variant: 'cli:beta'
-      runner: "ubuntu-latest"
+      runner: "small"
       part: 1
       of: 1
       include: ''
diff --git a/.github/workflows/build-kernel-on-merge-request.yml b/.github/workflows/build-kernel-on-merge-request.yml
index 3883d4ef81af..444f7e11077f 100644
--- a/.github/workflows/build-kernel-on-merge-request.yml
+++ b/.github/workflows/build-kernel-on-merge-request.yml
@@ -33,7 +33,7 @@ jobs:
     with:
 
       uploading: "true"
-      runner: "ubuntu-latest"      
+      runner: "fast"
       reference: ${{ github.event.pull_request.head.sha }}
 
     secrets:
@@ -44,3 +44,16 @@ jobs:
       SCRIPTS_ACCESS_TOKEN: ${{ secrets.SCRIPTS_ACCESS_TOKEN }}
       KEY_TORRENTS: ${{ secrets.KEY_TORRENTS }}
       KNOWN_HOSTS_UPLOAD: ${{ secrets.KNOWN_HOSTS_UPLOAD }}
+
+  jobsend:
+    name: Cleanup
+    needs: [Build]
+    runs-on: "small"
+    if: ${{ github.repository_owner == 'Armbian' }}
+    steps:
+      - uses: geekyeggo/delete-artifact@v1
+        with:
+          name: changes
+      - uses: geekyeggo/delete-artifact@v1
+        with:
+          name: hash
diff --git a/.github/workflows/build-train.yml b/.github/workflows/build-train.yml
index 7d447df1dd58..ff52ffe8f37a 100644
--- a/.github/workflows/build-train.yml
+++ b/.github/workflows/build-train.yml
@@ -89,27 +89,10 @@ jobs:
 
   ##########################################################################################
   #                                                                                        #
-  #                           Build board support packages                                 #
+  #                Build u-boot and board support packages                                 #
   #                                                                                        #
   ##########################################################################################
 
-  BSP:
-    needs: Kernel
-    if: ${{ success() && github.repository_owner == 'Armbian' }}
-    uses: armbian/scripts/.github/workflows/build-bsp.yml@master
-
-    with:
-      uploading: true
-
-    secrets:
-      GPG_KEY1: ${{ secrets.GPG_KEY1 }}
-      GPG_PASSPHRASE1: ${{ secrets.GPG_PASSPHRASE1 }}
-      GPG_KEY2: ${{ secrets.GPG_KEY2 }}
-      GPG_PASSPHRASE2: ${{ secrets.GPG_PASSPHRASE2 }}
-      SCRIPTS_ACCESS_TOKEN: ${{ secrets.SCRIPTS_ACCESS_TOKEN }}
-      KEY_TORRENTS: ${{ secrets.KEY_TORRENTS }}
-      KNOWN_HOSTS_UPLOAD: ${{ secrets.KNOWN_HOSTS_UPLOAD }}
-
   legacy:
     needs: Check
     if: ${{ success() && github.repository_owner == 'Armbian' }}
@@ -181,7 +164,7 @@ jobs:
   ##########################################################################################
 
   Deploy:
-    needs: [Kernel,Desktop,BSP,legacy,current,edge]
+    needs: [Kernel,Desktop,legacy,current,edge]
     if: ${{ success() && github.repository_owner == 'Armbian' }}
     uses: armbian/scripts/.github/workflows/deploy.yml@master