diff --git a/.github/workflows/build-riscv64.yml b/.github/workflows/build-riscv64.yml
index d685e0897..4900a3a0b 100644
--- a/.github/workflows/build-riscv64.yml
+++ b/.github/workflows/build-riscv64.yml
@@ -35,12 +35,8 @@ jobs:
       run: |
         docker run --rm --platform linux/riscv64 \
           -v ${{ github.workspace }}:/ws --workdir=/ws \
-          riscv64/debian:rc-buggy \
+          chianetwork/ubuntu-22.04-risc-builder:latest \
           bash -exc '\
-          apt-get update && \
-          apt-get install -y git curl build-essential && \
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
-          source $HOME/.cargo/env && \
           cargo test --release
           '
 
@@ -67,13 +63,10 @@ jobs:
       run: |
         docker run --rm --platform linux/riscv64 \
           -v ${{ github.workspace }}:/ws --workdir=/ws \
-          riscv64/debian:rc-buggy \
+          chianetwork/ubuntu-22.04-risc-builder:latest \
           bash -exc '\
-          apt-get update && \
-          apt-get install -y build-essential git python3-full python3-dev python3-pip libssl-dev curl && \
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
-          source $HOME/.cargo/env && \
-          python3 -m venv venv && \
+          pyenv global 3.10
+          python -m venv venv && \
           source ./venv/bin/activate && \
           pip install --upgrade pip && \
           pip install --extra-index-url https://pypi.chia.net/simple/ maturin==1.2.3 && \