diff --git a/.github/workflows/bwrap.yml b/.github/workflows/bwrap.yml
index 1f4fcbd..aac301b 100644
--- a/.github/workflows/bwrap.yml
+++ b/.github/workflows/bwrap.yml
@@ -12,8 +12,8 @@ on:
       - master
 
 jobs:
-  run:
-    name: Run under bubblewrap
+  sysa:
+    name: Run sysa under bubblewrap
     runs-on: ubuntu-latest
     steps:
       - name: Install bubblewrap
@@ -45,8 +45,43 @@ jobs:
             sysc/distfiles
           key: cache-${{ hashFiles('sys*/*/sources') }}
       - name: Run bootstrap
-        id: bootstrap
-        run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2
+        run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass1
+      - name: Archive created packages
+        if: failure() # archive failed builds progress
+        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
+        uses: actions/upload-artifact@v3
+        with:
+          name: sysc_image
+          path: sysc_image.tar
+
+  sysc:
+    name: Run sysc under bubblewrap
+    needs: sysa
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install bubblewrap
+        run: sudo apt install bubblewrap
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          # 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
+        uses: actions/download-artifact@v3
+        with:
+          name: sysc_image
+      - name: Extract sysc_image
+        run: tar -xf sysc_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
         uses: actions/upload-artifact@v3