diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0ce8850..407cc85 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,7 @@ on:
 jobs:
   build-debs:
     runs-on: ${{ matrix.runner }}
+    name: ${{ matrix.architecture }}
     strategy:
       matrix:
         architecture:
@@ -20,6 +21,10 @@ jobs:
             runner: ubuntu-latest
           - architecture: armhf
             runner: ubuntu-24.04-arm
+          - architecture: arm64
+            runner: ubuntu-24.04-arm
+          - architecture: riscv64
+            runner: ubuntu-latest
     steps:
       - name: Checkout the code
         uses: actions/checkout@v4
@@ -36,6 +41,7 @@ jobs:
         with:
           host-arch: ${{ matrix.architecture == 'all' && 'amd64' || matrix.architecture }}
           buildpackage-opts: --build=full
+          docker-image: debian:testing-20250407
       - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v6
diff --git a/debian/artifacts/conf/distributions b/debian/artifacts/conf/distributions
index e492ba8..a9f9f05 100644
--- a/debian/artifacts/conf/distributions
+++ b/debian/artifacts/conf/distributions
@@ -2,7 +2,7 @@ Origin: Armbian
 Label: Armbian Package Archive APA
 Suite: stable
 Codename: current
-Architectures: amd64 armhf source
+Architectures: amd64 arm64 riscv64 armhf source
 Components: main
 Description: packages provided by the Armbian project
 SignWith: DF00FAF1C577104B50BF1D0093D6889F9F0E78D5