diff --git a/debian/changelog b/debian/changelog
index 815c5d77..dd867fa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (23.10.37) mantic; urgency=medium
+
+  * fix: armhf flavour for 6.5+ kernel is now generic (LP: #2036192)
+
+ -- Philip Roche <phil.roche@ubuntu.com>  Fri, 15 Sep 2023 11:31:23 +0100
+
 livecd-rootfs (23.10.36) mantic; urgency=medium
 
   * Since we restored the minimal layer, we also need to adjust all hook
diff --git a/live-build/auto/build b/live-build/auto/build
index 12cdb1a8..8d53a275 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -618,11 +618,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 	fi
 	case $FLAVOUR in
 		allwinner|virtual|generic-hwe-*)
-			if [ "$ARCH" = "armhf" ]; then
-				FLAVOUR="generic-lpae"
-			else
-				FLAVOUR="generic"
-			fi
+			FLAVOUR="generic"
 			;;
 		oem-*)
 			FLAVOUR="oem"
diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image
index 3b356075..8e6e9726 100644
--- a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image
+++ b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image
@@ -3,8 +3,6 @@ base/disk-image.binary
 base/disk-image-ppc64el.binary
 provides livecd.ubuntu-cpc.ext4
 provides livecd.ubuntu-cpc.initrd-generic
-provides livecd.ubuntu-cpc.initrd-generic-lpae
 provides livecd.ubuntu-cpc.kernel-generic
-provides livecd.ubuntu-cpc.kernel-generic-lpae
 provides livecd.ubuntu-cpc.manifest
 provides livecd.ubuntu-cpc.filelist
diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi
index 438930b7..2faa4aa1 100644
--- a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi
+++ b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi
@@ -1,8 +1,6 @@
 base/disk-image-uefi.binary
 provides livecd.ubuntu-cpc.ext4
 provides livecd.ubuntu-cpc.initrd-generic
-provides livecd.ubuntu-cpc.initrd-generic-lpae
 provides livecd.ubuntu-cpc.kernel-generic
-provides livecd.ubuntu-cpc.kernel-generic-lpae
 provides livecd.ubuntu-cpc.manifest
 provides livecd.ubuntu-cpc.filelist