diff --git a/debian/changelog b/debian/changelog
index fa7ba30a..7f1cb11e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (25.04.18) UNRELEASED; urgency=medium
+
+  * Pre-emptively include the override to not try to build HWE kernel layer in
+    post .2 server riscv64 ISOs.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 17 Feb 2025 11:12:00 +1300
+
 livecd-rootfs (25.04.17) plucky; urgency=medium
 
   [ Dan Bungert ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 7965a06f..c3f7bd3b 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1042,6 +1042,11 @@ case $PROJECT in
 						;;
 				esac
 
+				if [ $ARCH = "riscv64" ]; then
+					# For RISC-V we only offer one kernel
+					variants='ga'
+				fi
+
 				for variant in $variants; do
 					if [ "$variant" = "ga" ]; then
 						kernel_metapkg=linux-generic