diff --git a/debian/changelog b/debian/changelog
index f827a888..1e6966b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.644) focal; urgency=medium
+
+  * Rename the raspi3 SUBARCH to raspi, as we generate universal generic pi
+    images since long.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Fri, 21 Feb 2020 12:37:02 +0100
+
 livecd-rootfs (2.643) focal; urgency=medium
 
   * subiquity:
diff --git a/live-build/auto/build b/live-build/auto/build
index 2e4d9415..1a398e57 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -871,7 +871,7 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 fi
 
 case $SUBARCH in
-	raspi2|raspi3)
+	raspi|raspi2)
 		# copy the kernel and initrd to a predictable directory for
 		# ubuntu-image consumption.  In some cases, like in pi2/3
 		# u-boot, the bootloader needs to contain the kernel and initrd,
diff --git a/live-build/auto/config b/live-build/auto/config
index 436df5fa..957da9b2 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -280,7 +280,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
 	case $PROJECT:${SUBPROJECT:-} in
 		ubuntu-cpc:*|ubuntu:desktop-preinstalled)
 			case $SUBARCH in
-				raspi3|imx6)
+				raspi|imx6)
 					IMAGEFORMAT=ubuntu-image
 					;;
 				*)
@@ -326,10 +326,14 @@ case $IMAGEFORMAT in
 				MODEL=pc-i386 ;;
 			arm64+snapdragon)
 				MODEL=dragonboard ;;
+			armhf+raspi)
+				MODEL=pi ;;
 			armhf+raspi2)
 				MODEL=pi2 ;;
 			armhf+raspi3)
 				MODEL=pi3 ;;
+			arm64+raspi)
+				MODEL=pi-arm64 ;;
 			arm64+raspi3)
 				MODEL=pi3-arm64 ;;
 			armhf+cm3)
@@ -404,7 +408,7 @@ case $IMAGEFORMAT in
 
 			# Certain models have different names but are built from the same source gadget tree
 			case $MODEL in
-				pi3-arm64)
+				pi-arm64|pi3-arm64)
 					MODEL=pi3 ;;
 			esac
 
@@ -895,7 +899,8 @@ case $ARCH in
 				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
 				BINARY_REMOVE_LINUX=false
 				;;
-			raspi3)
+			raspi)
+				# Generic Raspberry Pi images
 				COMPONENTS='main restricted universe multiverse'
 				KERNEL_FLAVOURS=raspi2
 				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
@@ -1000,7 +1005,7 @@ EOF
 esac
 
 case $ARCH+$SUBARCH in
-	armhf+raspi2|armhf+raspi3|arm64+raspi3)
+	armhf+raspi2|armhf+raspi|arm64+raspi)
 		cat > config/hooks/01-firmware-directory.chroot_early <<EOF
 #!/bin/sh -ex
 mkdir -p /boot/firmware