diff --git a/README.md b/README.md
index a6bdcfd..7b8de94 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ This list of officially supported platforms is available in the Node.js [BUILDIN
  * **linux-x64-glibc-217**: Linux x64, compiled with glibc 2.17 to support [older Linux distros](https://en.wikipedia.org/wiki/Glibc#Version_history), QNAP QTS 4.x and 5.x, and Synology DSM 7, and other environments where a newer glibc is unavailable.
  * **linux-x86**: Linux x86 (32-bit) binaries compiled against libc 2.17, similar to the way the official [linux-x64 binaries are produced](https://github.com/nodejs/node/blob/main/BUILDING.md#official-binary-platforms-and-toolchains). 32-bit Linux binaries were dropped for Node.js 10 and 32-bit support is now considered "Experimental".
  * **linux-armv6l**: Linux ARMv6 binaries, cross-compiled on Ubuntu 16.04 with a [custom GCC 6 toolchain](https://github.com/rvagg/rpi-newer-crosstools) (for Node.js versions earlier than 16) or Ubuntu 18.04 with a [custom GCC 8 toolchain](https://github.com/rvagg/rpi-newer-crosstools) (for Node.js 16 and later) in a similar manner to the official linux-armv7l binaries. Binaries are optimized for `armv6zk` which is suitable for Raspberry Pi devices (1, 1+ and Zero in particular). ARMv6 binaries were dropped from Node.js 12 and ARMv6 support is now considered "Experimental".
- * **riscv64**: Linux riscv64 (RISC-V), cross compiled on Ubuntu 20.04 with the toolchain which the Adoptium project uses (for  now...). Built with --openssl-no-asm (Should be with --with-intl=none but that gets overriden)
+ * **riscv64**: Linux riscv64 (RISC-V), cross compiled on Ubuntu 22.04 with the ubuntu toolchain. Built with --openssl-no-asm (Should be with --with-intl=none but that gets overriden)
  * **loong64**: Linux loong64 (LoongArch64), cross compiled on Ubuntu 20.04 with the toolchain.
 
 "Experimental" status for Node.js is defined as:
diff --git a/recipes/riscv64/Dockerfile b/recipes/riscv64/Dockerfile
index 2ba19fe..c93939b 100644
--- a/recipes/riscv64/Dockerfile
+++ b/recipes/riscv64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG GID=1000
 ARG UID=1000
@@ -13,15 +13,14 @@ RUN apt-get update \
     && apt-get update \
     && apt-get install -y \
          git \
-	 g++-9 \
+	     g++-9 \
          curl \
          make \
          python3 \
-	 python3-distutils \
+	     python3-distutils \
          ccache \
-         xz-utils
-
-RUN curl https://ci.adoptium.net/userContent/riscv/riscv_toolchain_linux64.tar.xz | tar xJf - -C /opt
+         g++-riscv64-linux-gnu \
+         gcc-riscv64-linux-gnu
 
 COPY --chown=node:node run.sh /home/node/run.sh
 
diff --git a/recipes/riscv64/run.sh b/recipes/riscv64/run.sh
index 97bc464..9b651b6 100755
--- a/recipes/riscv64/run.sh
+++ b/recipes/riscv64/run.sh
@@ -19,8 +19,8 @@ cd "node-${fullversion}"
 
 export CC_host="ccache gcc-9"
 export CXX_host="ccache g++-9"
-export CC="ccache /opt/riscv_toolchain_linux/bin/riscv64-unknown-linux-gnu-gcc"
-export CXX="ccache /opt/riscv_toolchain_linux/bin/riscv64-unknown-linux-gnu-g++"
+export CC="ccache riscv64-linux-gnu-gcc"
+export CXX="ccache riscv64-linux-gnu-g++"
 
 make -j$(getconf _NPROCESSORS_ONLN) binary V= \
   DESTCPU="riscv64" \