diff --git a/.github/workflows/build-cache.yml b/.github/workflows/build-cache.yml
index 2570afdb33..94a3c3de6a 100644
--- a/.github/workflows/build-cache.yml
+++ b/.github/workflows/build-cache.yml
@@ -7,7 +7,7 @@ jobs:
 
   Cache:
     
-    name: Make cache
+    name: Determine needed targets
     runs-on: [self-hosted, Linux, cache]
     if: ${{ github.repository_owner == 'armbian' }}
     outputs:
@@ -82,13 +82,12 @@ jobs:
             cd ..
             cd build-rootfs
             PARTS=$(cat filelist.txt | wc -l)
-            split -d --numeric=1 --number=r/${PARTS} --additional-suffix=.conf --suffix-length=2 filelist.txt split-
+            split -d --numeric=1 --number=r/${PARTS} --additional-suffix=.conf --suffix-length=3 filelist.txt split-
         - name: Prepare matrix
           id: list_dirs
-          run:
-            PARTS=$(cat filelist.txt | wc -l)
-            MATRIX=$(seq -w 01 "$PARTS")
-            echo ::set-output name=matrix::$(for x in $(echo "${MATRIX}"); do echo $x; done|jq -cnR '[inputs | select(length>0)]' | jq)
+          run: |
+            PARTS=$(cat build-rootfs/filelist.txt | wc -l)
+            echo ::set-output name=matrix::$(for x in $(seq -w 1 $PARTS); do echo $x; done|jq -cnR '[inputs | select(length>0)]' | jq)
 
   Job:
 
diff --git a/.github/workflows/docker-to-hub.yml b/.github/workflows/docker-to-hub.yml
index 745f318247..3ae1c530d8 100644
--- a/.github/workflows/docker-to-hub.yml
+++ b/.github/workflows/docker-to-hub.yml
@@ -1,4 +1,4 @@
-name: Docker hub build 
+name: Build Docker hub image
 # This workflow is triggered 1st, 16th and 31st
 on:
 
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
new file mode 100644
index 0000000000..d2a868fd3e
--- /dev/null
+++ b/.github/workflows/rebase.yml
@@ -0,0 +1,19 @@
+name: Automatic Rebase
+on:
+  issue_comment:
+    types: [created]
+jobs:
+  rebase:
+    name: Rebase
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
+      - name: Automatic Rebase
+        uses: cirrus-actions/rebase@1.4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}