From 1770c498d06db630546d57016778219accb1f324 Mon Sep 17 00:00:00 2001
From: Gilver <roachy@fyralabs.com>
Date: Tue, 5 May 2026 21:45:38 -0500
Subject: [PATCH 1/2] feat(ci): Add release package to bootstrap

---
 .github/workflows/bootstrap.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index ccf4512..0182fb6 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -19,14 +19,21 @@ jobs:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
+      - name: Install build dependencies
+        run: dnf builddep -y ultramarine/ultramarine-mock-configs*.spec
+
       - name: Build ultramarine-mock-configs
         run: |
-          anda build -D "vendor Ultramarine Linux" -c ultramarine-${{ matrix.version }}-${{ matrix.arch }} ultramarine/ultramarine-mock-configs/pkg
+          anda build -rrpmbuild -D "vendor Ultramarine Linux" ultramarine/ultramarine-mock-configs/pkg
 
       - name: Install ultramarine-mock-configs
         run: |
           dnf install -y anda-build/rpm/rpms/ultramarine-mock-configs*.rpm
 
+      - name: Build ultramarine-release
+        run: |
+          anda build -D "vendor Ultramarine Linux" -c ultramarine-${{ matrix.version }}-${{ matrix.pkg.arch }} ultramarine/release/pkg
+
       - name: Upload packages to subatomic
         run: |
           subatomic-cli upload --prune \

From 8f6bcf3f1edde87f22e31b28b6a5c9e6bb7138d1 Mon Sep 17 00:00:00 2001
From: Gilver <roachy@fyralabs.com>
Date: Tue, 5 May 2026 21:59:04 -0500
Subject: [PATCH 2/2] feat(ci): Bootstrap hacks

---
 .github/workflows/bootstrap.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 0182fb6..775f86a 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/ultramarine-linux/builder:umrawhide
+      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
@@ -24,7 +24,7 @@ jobs:
 
       - name: Build ultramarine-mock-configs
         run: |
-          anda build -rrpmbuild -D "vendor Ultramarine Linux" ultramarine/ultramarine-mock-configs/pkg
+          anda build -D "vendor Ultramarine Linux" -D "dist .um${{ matrix.version }}" -c fedora-${{ matrix.version }}-${{ matrix.arch }} ultramarine/ultramarine-mock-configs/pkg
 
       - name: Install ultramarine-mock-configs
         run: |
@@ -32,7 +32,7 @@ jobs:
 
       - name: Build ultramarine-release
         run: |
-          anda build -D "vendor Ultramarine Linux" -c ultramarine-${{ matrix.version }}-${{ matrix.pkg.arch }} ultramarine/release/pkg
+          anda build -D "vendor Ultramarine Linux" -c ultramarine-${{ matrix.version }}-${{ matrix.arch }} ultramarine/release/pkg
 
       - name: Upload packages to subatomic
         run: |