diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index bfe45da7ca..f4a1285f86 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -40,7 +40,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - uses: terrapkg/anda-build@main
diff --git a/.github/workflows/bootstrap-subatomic.yml b/.github/workflows/bootstrap-subatomic.yml
deleted file mode 100644
index 02adf22286..0000000000
--- a/.github/workflows/bootstrap-subatomic.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: Bootstrap subatomic
-
-on:
-  workflow_dispatch:
-
-jobs:
-  bootstrap:
-    strategy:
-      matrix:
-        version: ["38"]
-        arch: ["x86_64", "aarch64"]
-      fail-fast: true
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
-    container:
-      image: fedora:38
-      options: --cap-add=SYS_ADMIN --privileged
-    steps:
-      # - name: Run shell commands
-      #   run: |
-      #     git config --global url.https://github.com/.insteadOf git://github.com/
-      #     git clone https://github.com/FyraLabs/anda.git
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "^1.19"
-
-      - name: Install repositories
-        run: |
-          sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
-      - run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/subatomic
-          set-safe-directory: true
-          fetch-depth: 1
-      - name: Set up git repository
-        run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - name: Install Anda
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: anda
-
-      - name: Install Subatomic
-        run: go install github.com/FyraLabs/subatomic/subatomic-cli@latest
-
-      - name: Build
-        run: anda build -c anda-38-${{ matrix.arch }} subatomic -p rpm
-      - run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
diff --git a/.github/workflows/bootstrap-anda.yml b/.github/workflows/bootstrap.yml
similarity index 70%
rename from .github/workflows/bootstrap-anda.yml
rename to .github/workflows/bootstrap.yml
index d3a23e651e..78b8eff662 100644
--- a/.github/workflows/bootstrap-anda.yml
+++ b/.github/workflows/bootstrap.yml
@@ -1,4 +1,4 @@
-name: Bootstrap anda
+name: Bootstrap Andaman and Subatomic
 
 on:
   workflow_dispatch:
@@ -15,9 +15,6 @@ jobs:
       image: fedora:38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/anda
       - uses: actions/setup-go@v3
         with:
           go-version: "^1.19"
@@ -26,7 +23,11 @@ jobs:
         run: |
           sudo dnf install -y dnf-plugins-core
           sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
-      - run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
+          sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/subatomic
+          ref: bootstrap
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
@@ -36,13 +37,20 @@ jobs:
           command: install
           args: anda
 
+      - name: Build Subatomic
+        run: anda build -c anda-38-${{ matrix.arch }} subatomic -p rpm
       - name: Install Subatomic
-        run: go install github.com/FyraLabs/subatomic/subatomic-cli@latest
+        run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm
 
-      - name: Build
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/anda
+
+      - name: Build Andaman
         run: anda build -c anda-38-${{ matrix.arch }} anda -p rpm
 
-      - run: |
+      - name: Upload to Subatomic
+        run: |
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 12759381eb..d48e9757db 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
     inputs:
       packages:
-        description: "Packages to Build (pkg-a, pkg-b, ...)"
+        description: "Packages to Build"
         required: true
 
 jobs:
@@ -25,13 +25,12 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - uses: terrapkg/anda-build@main
         with:
           name: "${{ matrix.pkg }}pkg"
-          mockConfig: anda-38-${{ matrix.arch }}
           extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
           andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 
diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml
index 59f4e73398..205f1e79dc 100644
--- a/.github/workflows/mass-rebuild.yml
+++ b/.github/workflows/mass-rebuild.yml
@@ -60,7 +60,6 @@ jobs:
         if: steps.check_files.outputs.EXISTS == 'true'
         with:
           name: "${{ matrix.pkg }}pkg"
-          mockConfig: anda-38-${{ matrix.arch }}
           extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
           andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo