diff --git a/.github/workflows/build-kernel-cache.yml b/.github/workflows/build-kernel-cache.yml
index bc38d21b..2ad2a820 100644
--- a/.github/workflows/build-kernel-cache.yml
+++ b/.github/workflows/build-kernel-cache.yml
@@ -1,4 +1,4 @@
-name: Build with Docker
+name: Build kernel cache
 on:
   workflow_dispatch:
   workflow_call:
@@ -28,7 +28,7 @@ jobs:
   prepare:
 
     name: "Make JSON"
-#    if: ${{ github.repository_owner == 'armbian' }}
+    if: ${{ github.repository_owner == 'armbian' }}
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{steps.json.outputs.JSON_CONTENT}}
@@ -44,7 +44,7 @@ jobs:
           repository: armbian/build
           ref:  "${{ inputs.BUILD_BRANCH }}"
           fetch-depth: 1
-          clean: false # true is default. it *will* delete the hosts /dev if mounted inside.
+          clean: false
           path: build
 
       - name: Checkout Armbian OS
@@ -82,21 +82,22 @@ jobs:
               done <<< "$FILES"
           done | sort | uniq | sort -u -t: -k1,3 | cut -d":" -f3,4,5 | sort | uniq | sed "s/:/ /g" | awk '{ printf "%s%s%s\n", "{\"board\":\""$2"\",", "\"branch\":\""$1"\",", "\"runner\":\""$3"\"}" }' | jq -s >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
+
   kernel:
-#    if: ${{ github.repository_owner == 'armbian' }}
+
+    if: ${{ github.repository_owner == 'armbian' }}
     needs: [ prepare ]
+    name: "${{ matrix.board }} ${{ matrix.branch }} ${{ matrix.runner }}"
+    runs-on: "${{ matrix.runner }}"
     strategy:
-      fail-fast: false # let other jobs try to complete if one fails
+      fail-fast: false
       matrix:
         include: ${{ fromJSON(needs.prepare.outputs.matrix) }}
-
-    runs-on: "${{ matrix.runner }}"
-
-    name: "${{ matrix.board }} ${{ matrix.branch }} ${{ matrix.runner }}"
+    
     env:
       BRANCH: "${{ matrix.branch }}"
       BOARD: "${{ matrix.board }}"
- #     OCI_TARGET_BASE: "ghcr.io/${{ github.repository }}/" # This is picked up by the Docker launcher automatically
+
     steps:
 
       - name: "Fix permissions"
@@ -108,7 +109,7 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
-          username: ${{ inputs.ACCESS_NAME }} # GitHub username or org
+          username: ${{ inputs.ACCESS_NAME }}      # GitHub username or org
           password: ${{ secrets.ACCESS_TOKEN }}    # GitHub actions builtin token. repo has to have pkg access.
 
       - name: Checkout build repo
@@ -117,7 +118,7 @@ jobs:
           repository: armbian/build #${{ github.repository_owner }}/armbian-build
           ref:  "${{ inputs.BUILD_BRANCH }}"
           fetch-depth: 1
-          clean: false # true is default. it *will* delete the hosts /dev if mounted inside.
+          clean: false
 
       - name: Build Kernel ${{env.BOARD}}:${{env.BRANCH}}
         id: kernel
@@ -129,7 +130,7 @@ jobs:
           ls -l output/debs/
           du output
       - name: "Generate key id" # We need this in case we run multiple runners on one machine
-        run: echo "RANDOM=ID_$((RANDOM%1000000))" >> $GITHUB_ENV
+        run: echo "RANDOM=ID_$((RANDOM%100000000))" >> $GITHUB_ENV
         shell: bash
 
       - name: Install SSH key for storage
diff --git a/.github/workflows/build-u-boot-cache.yml b/.github/workflows/build-u-boot-cache.yml
index cd562147..04859cd1 100644
--- a/.github/workflows/build-u-boot-cache.yml
+++ b/.github/workflows/build-u-boot-cache.yml
@@ -28,7 +28,7 @@ jobs:
   prepare:
 
     name: "Make JSON"
-#    if: ${{ github.repository_owner == 'armbian' }}
+    if: ${{ github.repository_owner == 'armbian' }}
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{steps.json.outputs.JSON_CONTENT}}
@@ -44,7 +44,7 @@ jobs:
           repository: armbian/os
           ref:  main
           fetch-depth: 1
-          clean: false # true is default. it *will* delete the hosts /dev if mounted inside.
+          clean: false
 
       - name: Build JSON
         id: json
@@ -53,21 +53,23 @@ jobs:
           echo 'JSON_CONTENT<<EOF' >> $GITHUB_OUTPUT
           cat targets/*.conf | grep -v "^$" | grep -v "^#" | ${{ inputs.include }} ${{ inputs.exclude }} sed 's/\s\s*/ /g' | cut -d' ' -f1,2 | sed 's/ / /g' | sort | uniq | awk '{ printf "%s%s\n", "{\"board\":\""$1"\",", "\"branch\":\""$2"\"}" }' | jq -s >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
-  "u-boot":
-#    if: ${{ github.repository_owner == 'armbian' }}
+
+  uboot:
+
+    if: ${{ github.repository_owner == 'armbian' }}
     needs: [ prepare ]
+    name: "${{ matrix.board }}"
+    runs-on: [ "${{ inputs.BUILD_RUNNER }}" ]
     strategy:
-      fail-fast: false # let other jobs try to complete if one fails
+      fail-fast: false
       matrix:
         include: ${{ fromJSON(needs.prepare.outputs.matrix) }}
-    runs-on: [ "${{ inputs.BUILD_RUNNER }}" ]
-    name: "${{ matrix.board }}"
-   
+
     env:
       BOARD: "${{ matrix.board }}"
       BRANCH: "${{ matrix.branch }}"
       VARIANT: "${{ matrix.variant }}"
-#      OCI_TARGET_BASE: "ghcr.io/${{ github.repository }}/" # This is picked up by the Docker launcher automatically
+
     steps:
 
       - name: "Fix permissions"
@@ -79,7 +81,7 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
-          username: ${{ inputs.ACCESS_NAME }} # GitHub username or org
+          username: ${{ inputs.ACCESS_NAME }}      # GitHub username or org
           password: ${{ secrets.ACCESS_TOKEN }}    # GitHub actions builtin token. repo has to have pkg access.
 
       - name: Checkout build repo
@@ -88,7 +90,7 @@ jobs:
           repository: armbian/build #${{ github.repository_owner }}/armbian-build
           ref: ${{ inputs.BUILD_BRANCH }}
           fetch-depth: 1
-          clean: false # true is default. it *will* delete the hosts /dev if mounted inside.
+          clean: false
 
       - name: Build U-Boot ${{env.BOARD}}:${{env.BRANCH}} (variant ${{env.VARIANT}})
         id: uboot
@@ -100,7 +102,7 @@ jobs:
             "BRANCH=${{env.BRANCH}}" "BOARD=${{env.BOARD}}" "FORCE_ARTIFACTS_DOWNLOAD=yes" "SHARE_LOG=yes" ${{env.VARIANT}}             
 
       - name: "Generate key id" # We need this in case we run multiple runners on one machine
-        run: echo "RANDOM=ID_$((RANDOM%1000000))" >> $GITHUB_ENV
+        run: echo "RANDOM=ID_$((RANDOM%100000000))" >> $GITHUB_ENV
         shell: bash
 
       - name: Install SSH key for storage