diff --git a/Dockerfile b/Dockerfile
index 70f1a61..6ec549b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@
 
 FROM --platform=amd64 calico/qemu-user-static:latest as qemu
 
-FROM debian:bookworm-slim as bpftool-build
+FROM ubuntu:22.04 as bpftool-build
 
 ARG SOURCE_REPO=https://github.com/libbpf/bpftool.git
 ARG SOURCE_REF=main
diff --git a/Makefile b/Makefile
index 10c64aa..9541318 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ all: image
 ###############################################################################
 # Input parameters.
 ###############################################################################
-DOCKER_PLATFORMS ?= linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x
+DOCKER_PLATFORMS ?= linux/amd64,linux/arm64/v8,linux/ppc64le,linux/riscv64,linux/s390x
 VERSION ?= v7.5.0
 IMAGE_ORG ?= calico
 IMAGE ?= $(IMAGE_ORG)/bpftool:$(VERSION)
diff --git a/README.md b/README.md
index 7931088..3f29dcb 100644
--- a/README.md
+++ b/README.md
@@ -19,10 +19,10 @@ make image-single-platform
 
 To build for specific platforms, use the `DOCKER_PLATFORMS` variable:
 ```
-make image DOCKER_PLATFORMS=linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x
+make image DOCKER_PLATFORMS=linux/amd64,linux/arm64/v8,linux/ppc64le,linux/riscv64,linux/s390x
 ```
 
 To build/push the image:
 ```
 make push
-```
\ No newline at end of file
+```