diff --git a/debian/changelog b/debian/changelog
index 7f35ab4d..c385bad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.525.40) bionic; urgency=medium
+
+  * Stop building per-pi-flavor images and only build a pi generic image for
+    core18. (LP: #1861520)
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Fri, 31 Jan 2020 16:57:01 +0100
+
 livecd-rootfs (2.525.39) bionic; urgency=medium
 
   * Ensure seed partition is mounted on no-cloud images which use system-boot
diff --git a/live-build/auto/config b/live-build/auto/config
index a056a875..858b0535 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -182,12 +182,10 @@ case $IMAGEFORMAT in
 				MODEL=pc-i386 ;;
 			arm64+snapdragon)
 				MODEL=dragonboard ;;
-			armhf+raspi2)
-				MODEL=pi2 ;;
-			armhf+raspi3|arm64+raspi3)
-				MODEL=pi3 ;;
-			armhf+cm3)
-				MODEL=cm3 ;;
+			armhf+raspi3)
+				MODEL=pi ;;
+			arm64+raspi3)
+				MODEL=pi-arm64 ;;
 			armhf+imx6)
 				MODEL=nitrogen6x ;;
 			*)
@@ -240,6 +238,14 @@ case $IMAGEFORMAT in
 		else
 			# classic images
 
+			# Certain models have different names but are built from the same source gadget tree
+			case $MODEL in
+				pi-arm64|pi)
+					# XXX: Temporarily this is still built from the pi3 tree,
+					#  but eventually we'll use the pi one.
+					MODEL=pi3 ;;
+			esac
+
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"