diff --git a/tools/cross_compiler_unix/Dockerfile b/tools/cross_compiler_unix/Dockerfile
index 3bef513..466f3c5 100644
--- a/tools/cross_compiler_unix/Dockerfile
+++ b/tools/cross_compiler_unix/Dockerfile
@@ -15,6 +15,12 @@ RUN apt-get update && apt-get install -y \
     python3 \
     git
 
+RUN wget https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2026.04.26/riscv32-musl-ubuntu-22.04-gcc.tar.xz && \
+    tar -xf riscv32-musl-ubuntu-22.04-gcc.tar.xz && \
+    rm riscv32-musl-ubuntu-22.04-gcc.tar.xz
+
+ENV PATH=/home/riscv/bin:$PATH
+
 COPY *.sh ./
 
 RUN sh build_musl.sh
diff --git a/tools/cross_compiler_unix/build_musl.sh b/tools/cross_compiler_unix/build_musl.sh
index 3f7b50e..fff0c15 100644
--- a/tools/cross_compiler_unix/build_musl.sh
+++ b/tools/cross_compiler_unix/build_musl.sh
@@ -32,9 +32,11 @@ sh ../packobjs.sh arm-none-eabi-gcc arm-none-eabi-ld /object_files/musl_objects_
 # Armv7 Thumb for Cortex-M3..7
 sh ../packobjs.sh arm-none-eabi-gcc arm-none-eabi-ld /object_files/musl_objects_armv7mthumb.o "-march=armv7e-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb"
 
-#sh ../packobjs.sh mips mips-linux-gnu-gcc-13 mips-linux-gnu-ld
+# RISC-V 32-bit
+sh ../packobjs.sh riscv32-unknown-linux-musl-gcc riscv32-unknown-linux-musl-ld /object_files/musl_objects_riscv32.o
 
-#sh ../packobjs.sh riscv64 riscv64-linux-gnu-gcc-13 riscv64-linux-gnu-ld
+# RISC-V 64-bit
+sh ../packobjs.sh riscv64-linux-gnu-gcc-13 riscv64-linux-gnu-ld /object_files/musl_objects_riscv64.o
 
 cp ./COPYRIGHT /object_files/