diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 7833d39..cfa789a 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -16,19 +16,45 @@ jobs:
           registry: ${{ vars.CONTAINER_REGISTRY }}
           username: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
           password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
-      - name: Restore fetch cache
-        id: cache-fetch
-        uses: actions/cache@v4
+
+      - name: Restore stage0 cache
+        id: restore-stage0
+        uses: actions/cache/restore@v4
         with:
-          path: fetch
-          key: ${{ hashFiles('src/fetch.py') }}
+          path: fetch/bootstrap/stage0
+          key: ${{ hashFiles('packages/bootstrap/stage0/package.toml') }}
+      - name: Fetch stage0
+        run: |
+          python3 ./src/fetch.py stage0
+      - name: Save stage0 cache
+        id: save-stage0
+        uses: actions/cache/save@v4
+        with:
+          path: fetch/bootstrap/stage0
+          key: ${{ hashFiles('packages/bootstrap/stage0/package.toml') }}
       - name: Build stage0
         env:
           CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
         run: |
           make registry-bootstrap-stage0 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
-      - name: Build stage1
-        env:
-          CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
-        run: |
-          make registry-bootstrap-stage1 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
+
+      # - name: Restore stage1 cache
+      #   id: restore-stage1
+      #   uses: actions/cache/restore@v4
+      #   with:
+      #     path: fetch/bootstrap/stage1
+      #     key: ${{ hashFiles('packages/bootstrap/stage1/package.toml') }}
+      # - name: Fetch stage1
+      #   run: |
+      #     python3 ./src/fetch.py stage1
+      # - name: Save stage1 cache
+      #   id: save-stage1
+      #   uses: actions/cache/save@v4
+      #   with:
+      #     path: fetch/bootstrap/stage1
+      #     key: ${{ hashFiles('packages/bootstrap/stage1/package.toml') }}
+      # - name: Build stage1
+      #   env:
+      #     CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
+      #   run: |
+      #     make registry-bootstrap-stage1 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex