diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..d8328911eec 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -62,13 +62,14 @@ jobs:
       - uses: actions/checkout@v1
         with:
           fetch-depth: 200
-      - name: Create hostrepo
-        run: ln -s "$(pwd)" /hostrepo
-      - run: common/travis/set_mirror.sh
-      - run: common/travis/prepare.sh
-      - run: common/travis/fetch_upstream.sh
+      - name: Create hostrepo and prepare masterdir
+        run: |
+         ln -s "$(pwd)" /hostrepo &&
+         common/travis/set_mirror.sh &&
+         common/travis/prepare.sh &&
+         common/travis/fetch_upstream.sh &&
+         common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
-      - run: common/travis/fetch-xtools.sh
       - name: Remove git after checkout to not interfere with build
         run: xbps-remove -yR git