diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 983e3c29a2..aeabb95690 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -34,28 +34,17 @@ jobs:
       - name: Install terra-mock-configs
         run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
 
-
-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/subatomic
-          set-safe-directory: true
-          fetch-depth: 1
       
       - name: Build Subatomic
         run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
+          anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/subatomic/pkg
       - name: Install Subatomic
         run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
 
 
-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/anda
-          fetch-depth: 1
-
       - name: Build Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/anda/pkg
 
 
       - name: Upload to Subatomic