diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 6502222db..48f906b66 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -236,6 +236,35 @@ jobs:
           python3 ./tools/run-tests.py --engine="./out/pure/walrus" basic-tests wasm-test-core jit
           python3 ./tools/run-tests.py --jit --engine="./out/pure/walrus" basic-tests wasm-test-core jit
 
+  build-test-on-riscv64:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Build in riscv64 container
+      uses: uraimo/run-on-arch-action@v2.8.1
+      with:
+        arch: riscv64
+        distro: ubuntu22.04
+
+        # Install deps into the container. With the token, the container will be cached
+        # The image is cached publically like a package
+        githubToken: ${{ github.token }}
+
+        install: |
+          apt-get update
+          apt-get install -y cmake build-essential ninja-build pkg-config python3 clang git
+        run: |
+          CC=clang CXX=clang++ cmake -H. -Bout/release -DWALRUS_MODE=release -DWALRUS_OUTPUT=shell -GNinja
+          CC=clang CXX=clang++ cmake -H. -Bout/pure -DWALRUS_MODE=release -DWALRUS_OUTPUT=shell -DWALRUS_WASI=OFF -GNinja
+          ninja -Cout/release
+          ninja -Cout/pure
+          python3 ./tools/run-tests.py --engine="./out/release/walrus"
+          #python3 ./tools/run-tests.py --jit --engine="./out/release/walrus"
+          python3 ./tools/run-tests.py --engine="./out/pure/walrus" basic-tests wasm-test-core jit
+          #python3 ./tools/run-tests.py --jit --engine="./out/pure/walrus" basic-tests wasm-test-core jit
+
   test-on-windows-x86-x64:
     runs-on: windows-2022
     strategy:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05ab4c4f7..ae4cc9000 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,8 @@ IF (NOT DEFINED WALRUS_ARCH)
         SET(WALRUS_ARCH "arm")
     ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
         SET(WALRUS_ARCH "aarch64")
+    ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "riscv64")
+        SET(WALRUS_ARCH "riscv64")
     ENDIF()
 ENDIF()