diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 51247db9722..83f2836e31f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -14,12 +14,14 @@ jobs:
     strategy:
       matrix:
         os:     [ubuntu-22.04, ubuntu-24.04]
-        mode:   [newlib, linux, musl]
+        mode:   [newlib, linux, musl, uclibc]
         target: [rv32gc-ilp32d, rv64gc-lp64d]
         compiler: [gcc, llvm]
         exclude:
           - mode: musl
             compiler: llvm
+          - mode: uclibc
+            compiler: llvm
     steps:
       - name: Remove unneeded frameworks to recover disk space
         run: |
@@ -57,7 +59,7 @@ jobs:
       - name: recover space
         run: |
           sudo du -hs / 2> /dev/null || true
-          sudo rm -rf binutils dejagnu gcc gdb glibc llvm musl newlib pk qemu spike || true
+          sudo rm -rf binutils dejagnu gcc gdb glibc llvm musl newlib pk qemu spike uclibc-ng || true
           sudo du -hs / 2> /dev/null || true
 
       - name: tarball build
@@ -72,6 +74,8 @@ jobs:
               MODE="glibc";;
             "musl")
               MODE="musl";;
+            "uclibc")
+              MODE="uclibc-ng";;
             *)
               MODE="elf";;
           esac
@@ -159,6 +163,8 @@ jobs:
               MODE="glibc";;
             "musl")
               MODE="musl";;
+            "uclibc")
+              MODE="uclibc-ng";;
             *)
               MODE="elf";;
           esac
diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml
index b73b37f7399..68238630175 100644
--- a/.github/workflows/nightly-release.yaml
+++ b/.github/workflows/nightly-release.yaml
@@ -49,12 +49,14 @@ jobs:
     strategy:
       matrix:
         os:       [ubuntu-22.04, ubuntu-24.04]
-        mode:     [newlib, linux, musl]
+        mode:     [newlib, linux, musl, uclibc]
         target:   [rv32gc-ilp32d, rv64gc-lp64d]
         compiler: [gcc, llvm]
         exclude:
           - mode: musl
             compiler: llvm
+          - mode: uclibc
+            compiler: llvm
     steps:
       - name: Remove unneeded frameworks to recover disk space
         run: |
@@ -89,7 +91,7 @@ jobs:
       - name: recover space
         run: |
           sudo du -hs / 2> /dev/null || true
-          sudo rm -rf binutils dejagnu gcc gdb glibc llvm musl newlib pk qemu spike || true
+          sudo rm -rf binutils dejagnu gcc gdb glibc llvm musl newlib pk qemu spike uclibc-ng || true
           sudo du -hs / 2> /dev/null || true
 
       - name: tarball build
@@ -104,6 +106,8 @@ jobs:
               MODE="glibc";;
             "musl")
               MODE="musl";;
+            "uclibc")
+              MODE="uclibc-ng";;
             *)
               MODE="elf";;
           esac