diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 706fa55e58..591688a717 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         version: ["rawhide"]
-        arch: ["x86_64", "aarch64"]
+        arch: ["x86_64", "aarch64", "riscv64"]
       fail-fast: true
     runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }}
     container:
@@ -63,7 +63,7 @@ jobs:
         run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
 
       - name: Tidy up output directory
-        run: rmdir anda-build/rpm/rpms/{noarch,aarch64,x86_64} | true
+        run: rmdir anda-build/rpm/rpms/{noarch,aarch64,x86_64,riscv64} | true
 
       - name: Upload packages to subatomic
         run: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 664348d3f8..6c974eedba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
           git commit -a -m "tmp"
           b=$(anda ci | sed -E 's@^build_matrix=@@')
           if [ "${{ inputs.architecture }}" != "" ]; then
-            # e.g.: [ unique_by(.pkg)[] | (.arch="x86_64", .arch="aarch64") ]
+            # e.g.: [ unique_by(.pkg)[] | (.arch="x86_64", .arch="aarch64", .arch="riscv64") ]
             filter=`echo -n "${{ inputs.architecture }}" | tr '[:space:]' '\n' | sed -E '/^$/d; s@^.+$@.arch="\0"@' | tr '\n' ', '`
             b=`echo $b | jq -c '[unique_by(.pkg)[] | ('"$filter"')]'`
           elif [ "${{ inputs.custom_builder }}" != "" ]; then
diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
index fbd6939520..ab43062fd3 100644
--- a/.github/workflows/json-build.yml
+++ b/.github/workflows/json-build.yml
@@ -42,7 +42,7 @@ jobs:
         pkg: ${{ fromJson(inputs.packages) }}
         version: ["rawhide"]
       fail-fast: false
-    runs-on: ${{ inputs.custom_builder && inputs.custom_builder || (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && format('cirun-x86-64-lg--{0}', github.run_id) || 'ubuntu-22.04' }}
+    runs-on: ${{ inputs.custom_builder && inputs.custom_builder || (matrix.pkg.arch == 'riscv64' && 'milkv-pioneer') || (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && format('cirun-x86-64-lg--{0}', github.run_id) || 'ubuntu-22.04' }}
     container:
       image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
       options: --cap-add=SYS_ADMIN --privileged