diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 01d24f9c3..71409b92f 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        arch: [x86_64, armv7l, i686]
+        arch: [i686, x86_64, armv7l]
         runner:
           - [self-hosted, X64]
           - [self-hosted, ARM]
@@ -168,7 +168,7 @@ jobs:
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
-          git fetch --depth=5
+          git fetch --shallow-since="1 week"
           mapfile -t updated_package_array < <( git diff-tree --no-commit-id --name-only -r $(git rev-parse origin/master)..$(git rev-parse --verify HEAD) | grep -v manifest | grep "^packages" | sed -e 's,packages/,,' -e 's,.rb,,')
           echo -e "Updated packages:" > /tmp/pr.txt
           for file in "${updated_package_array[@]}"
diff --git a/.github/workflows/Updater.yml b/.github/workflows/Updater.yml
index f153560b6..48acab20d 100644
--- a/.github/workflows/Updater.yml
+++ b/.github/workflows/Updater.yml
@@ -103,7 +103,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        arch: [x86_64, armv7l, i686]
+        arch: [i686, x86_64, armv7l]
         runner:
           - [self-hosted, X64]
           - [self-hosted, ARM]
@@ -223,7 +223,7 @@ jobs:
           git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
           git fetch --shallow-since="1 week"
           git diff-tree --no-commit-id --name-only -r $(git rev-parse origin/master)..$(git rev-parse --verify HEAD)
-          mapfile -t updated_package_array < <( git diff-tree --no-commit-id --name-only -r $(git diff-tree --no-commit-id --name-only -r $(git rev-parse origin/master)..$(git rev-parse --verify HEAD)) | grep -v manifest | grep "^packages" | sed -e 's,packages/,,' -e 's,.rb,,')
+          mapfile -t updated_package_array < <( git diff-tree --no-commit-id --name-only -r $(git rev-parse origin/master)..$(git rev-parse --verify HEAD) | grep -v manifest | grep "^packages" | sed -e 's,packages/,,' -e 's,.rb,,')
           echo -e "Updated packages:" > /tmp/pr.txt
           for file in "${updated_package_array[@]}"
             do