diff --git a/.ci-dockerfiles/cross-riscv64/Dockerfile b/.ci-dockerfiles/cross-riscv64/Dockerfile
index 283540a361..9ad71a1b6b 100644
--- a/.ci-dockerfiles/cross-riscv64/Dockerfile
+++ b/.ci-dockerfiles/cross-riscv64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230830
+FROM ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu24.04-builder:20240425
 
 USER root
 
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 211f41b5ed..d354b3bcaf 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -136,7 +136,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - image: ghcr.io/ponylang/ponyc-ci-cross-riscv64:20230830
+          - image: ghcr.io/ponylang/ponyc-ci-cross-riscv64:20240427
             name: riscv64 Linux glibc
 
     name: ${{ matrix.name }}
diff --git a/.github/workflows/update-lib-cache.yml b/.github/workflows/update-lib-cache.yml
index 9078b6b1d6..0e97eb9325 100644
--- a/.github/workflows/update-lib-cache.yml
+++ b/.github/workflows/update-lib-cache.yml
@@ -21,9 +21,9 @@ jobs:
           - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu22.04-builder:20230924
           - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230830
           - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20231003
-          - image: ghcr.io/ponylang/ponyc-ci-cross-riscv64:20230830
           - image: ghcr.io/ponylang/ponyc-ci-cross-arm:20240427
           - image: ghcr.io/ponylang/ponyc-ci-cross-armhf:20240427
+          - image: ghcr.io/ponylang/ponyc-ci-cross-riscv64:20240427
           - image: ghcr.io/ponylang/ponyc-ci-cross-aarch64:20240427
 
     name: ${{ matrix.image }}