diff --git a/cmake/riscv64.toolchain b/cmake/riscv64.toolchain
index 434f8224eb7..cee94788a2f 100644
--- a/cmake/riscv64.toolchain
+++ b/cmake/riscv64.toolchain
@@ -44,7 +44,7 @@ ELSE()
   IF(NOT XNNPACK_ENABLE_RISCV_FP16_VECTOR)
     SET(QEMU_OPTION -cpu rv64,zba=true,zbb=true,zbc=true,zbs=true,v=true,vlen=${VLEN},elen=64,vext_spec=v1.0 -L ${CMAKE_FIND_ROOT_PATH})
   ELSE()
-    SET(QEMU_OPTION -cpu rv64,zba=true,zbb=true,zbc=true,zbs=true,v=true,vlen=${VLEN},elen=64,vext_spec=v1.0,zfh=true,x-zvfh=true -L ${CMAKE_FIND_ROOT_PATH})
+    SET(QEMU_OPTION -cpu rv64,zba=true,zbb=true,zbc=true,zbs=true,v=true,vlen=${VLEN},elen=64,vext_spec=v1.0,zfh=true,zvfh=true -L ${CMAKE_FIND_ROOT_PATH})
   ENDIF()
 ENDIF()
 
diff --git a/docker/Dockerfile.riscv b/docker/Dockerfile.riscv
index 591fe083505..333dc839548 100644
--- a/docker/Dockerfile.riscv
+++ b/docker/Dockerfile.riscv
@@ -15,10 +15,10 @@ RUN apt-get update && apt-get install -y \
     bison
 
 WORKDIR /src
-RUN wget -nv https://download.qemu.org/qemu-9.2.2.tar.xz && \
-    tar xJf qemu-9.2.2.tar.xz
+RUN wget -nv https://download.qemu.org/qemu-10.2.1.tar.xz && \
+    tar xJf qemu-10.2.1.tar.xz
 
-WORKDIR /src/qemu-9.2.2
+WORKDIR /src/qemu-10.2.1
 RUN ./configure --target-list=riscv64-linux-user --static --disable-tools --disable-system --disable-docs
 RUN make -j$(nproc)
 
@@ -48,7 +48,7 @@ RUN wget -nv https://github.com/riscv-collab/riscv-gnu-toolchain/releases/downlo
     rm riscv64-glibc-ubuntu-24.04-llvm-nightly-2025.01.20-nightly.tar.xz
 
 WORKDIR /opt/qemu/bin
-COPY --from=qemu-builder /src/qemu-9.2.2/build/qemu-riscv64 .
+COPY --from=qemu-builder /src/qemu-10.2.1/build/qemu-riscv64 .
 ENV PATH="/opt/qemu/bin:${PATH}"
 
 ARG USERNAME=xnnpack