diff --git a/.github/workflows/bwrap.yml b/.github/workflows/bwrap.yml
index dcbe1bd..a4d1c11 100644
--- a/.github/workflows/bwrap.yml
+++ b/.github/workflows/bwrap.yml
@@ -12,8 +12,8 @@ on:
       - master
 
 jobs:
-  sysa:
-    name: Run sysa under bubblewrap
+  pass1:
+    name: Run up to Linux build under bubblewrap
     runs-on: ubuntu-latest
     steps:
       - name: Install bubblewrap
@@ -30,9 +30,8 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: |
-            sysa/distfiles
-            sysc/distfiles
-          key: cache-${{ hashFiles('sys*/*/sources') }}
+            externals/distfiles
+          key: cache-${{ hashFiles('steps/*/sources') }}
       - name: Get sources
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./download-distfiles.sh
@@ -41,9 +40,8 @@ jobs:
         uses: actions/cache/save@v3
         with:
           path: |
-            sysa/distfiles
-            sysc/distfiles
-          key: cache-${{ hashFiles('sys*/*/sources') }}
+            externals/distfiles
+          key: cache-${{ hashFiles('steps/*/sources') }}
       - name: Run bootstrap
         run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass1
       - name: Archive created packages
@@ -51,18 +49,18 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: packages
-          path: tmp/sysa/usr/src/repo/**
-      - name: Tar sysc_image
-        run: tar -cf sysc_image.tar tmp/sysa/sysc_image/
-      - name: Archive sysc_image
+          path: tmp/external/repo/**
+      - name: Tar pass1 image
+        run: tar -cf pass1_image.tar tmp
+      - name: Archive pass1_image
         uses: actions/upload-artifact@v3
         with:
-          name: internal_sysc_image
-          path: sysc_image.tar
+          name: internal_pass1_image
+          path: pass1_image.tar
 
-  sysc1:
-    name: Run sysc (part 1) under bubblewrap
-    needs: sysa
+  pass2:
+    name: Run up to Python bootstrap under bubblewrap
+    needs: pass1
     runs-on: ubuntu-latest
     steps:
       - name: Install bubblewrap
@@ -74,24 +72,24 @@ jobs:
           # There is a strange bug(?) in nongnu, when you clone a git repository
           # against a commit != HEAD with depth=1, it errors out.
           fetch-depth: 0
-      - name: Get sysc_image
+      - name: Get pass1_image
         uses: actions/download-artifact@v3
         with:
-          name: internal_sysc_image
-      - name: Extract sysc_image
-        run: tar -xf sysc_image.tar
+          name: internal_pass1_image
+      - name: Extract pass1_image
+        run: tar -xf pass1_image.tar
       - name: Run bootstrap
         run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass2
       - name: Archive created packages
         if: always() # archive failed builds progress
         uses: actions/upload-artifact@v3
         with:
-          name: internal_packages_sysc1
-          path: tmp/sysa/sysc_image/usr/src/repo/**
+          name: internal_packages_pass2
+          path: tmp/externals/repo/**
 
-  sysc2:
-    name: Run sysc (part 2) under bubblewrap
-    needs: sysc1
+  pass3:
+    name: Run remaining builds under bubblewrap
+    needs: pass2
     runs-on: ubuntu-latest
     steps:
       - name: Install bubblewrap
@@ -103,18 +101,18 @@ jobs:
           # There is a strange bug(?) in nongnu, when you clone a git repository
           # against a commit != HEAD with depth=1, it errors out.
           fetch-depth: 0
-      - name: Get sysc_image
+      - name: Get pass1_image
         uses: actions/download-artifact@v3
         with:
-          name: internal_sysc_image
-      - name: Extract sysc_image
-        run: tar -xf sysc_image.tar
+          name: internal_pass1_image
+      - name: Extract pass1_image
+        run: tar -xf pass1_image.tar
       # By doing this, all packages that have already been compiled will come from the preseed.
       - name: Get packages repo progress
         uses: actions/download-artifact@v3
         with:
-          name: internal_packages_sysc1
-          path: tmp/sysa/sysc_image/usr/src/repo-preseeded/
+          name: internal_packages_pass2
+          path: tmp/externals/repo-preseeded/
       - name: Run bootstrap
         run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass3
       - name: Archive created packages
@@ -122,4 +120,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: packages
-          path: tmp/sysa/sysc_image/usr/src/repo/**
+          path: tmp/externals/repo/**