diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 45ad143..8ad83ca 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -10,6 +10,7 @@ jobs:
         kas:
           - kas-poky-snapd.aarch64.yml
           - kas-poky-snapd.x86_64.yml
+          - kas-poky-snapd.riscv64.yml
     # TODO: use large runners when available
     runs-on: [self-hosted, Linux]
     timeout-minutes: 240
@@ -46,7 +47,7 @@ jobs:
           kas checkout ${{ matrix.kas }}
       - name: Run kas build
         run: |
-          kas build kas-poky-snapd.yml --target snapd-demo-image
+          kas build ${{ matrix.kas }} --target snapd-demo-image
       - name: Unmount tmpfs
         if: always()
         run: |
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 871a182..08d9af7 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -10,6 +10,7 @@ jobs:
         kas:
           - kas-poky-snapd.aarch64.yml
           - kas-poky-snapd.x86_64.yml
+          - kas-poky-snapd.riscv64.yml
     # TODO: use large runners when available
     runs-on: [self-hosted, Linux]
     timeout-minutes: 240
@@ -46,7 +47,7 @@ jobs:
           kas checkout ${{ matrix.kas }}
       - name: Run kas build
         run: |
-          kas build kas-poky-snapd.yml --target snapd-demo-image
+          kas build ${{ matrix.kas }} --target snapd-demo-image
       - uses: actions/upload-artifact@v4
         with:
           name: image-${{ matrix.kas }}
diff --git a/kas-poky-snapd.riscv64.yml b/kas-poky-snapd.riscv64.yml
new file mode 100644
index 0000000..276254b
--- /dev/null
+++ b/kas-poky-snapd.riscv64.yml
@@ -0,0 +1,5 @@
+header:
+  version: 8
+  includes:
+    - kas-poky-snapd.common.yml
+machine: qemuriscv64