diff --git a/debian/changelog b/debian/changelog
index 3b89bf3f..e3689def 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.599) UNRELEASED; urgency=medium
+
+  * Get rid of the deprecated raspi2 preinstalled image.  Switch to using the
+    raspi subarch instead of raspi3 for our generic Pi images.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Fri, 28 Jun 2019 10:42:49 +0200
+
 livecd-rootfs (2.598) eoan; urgency=medium
 
   * Change minimize-manual to read package section from version instead
diff --git a/live-build/auto/build b/live-build/auto/build
index 6c4d684d..dfbad267 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -822,7 +822,7 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 fi
 
 case $SUBARCH in
-	raspi2|raspi3)
+	raspi)
 		# 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 28667e64..bd1f6c5f 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -279,8 +279,8 @@ _get_live_passes ()
 if [ -z "${IMAGEFORMAT:-}" ]; then
 	case $PROJECT:${SUBPROJECT:-} in
 		ubuntu-cpc:*|ubuntu:desktop-preinstalled)
-			if [ "$SUBARCH" = "raspi3" ]; then
-				# For now only raspi3, but others are soon to follow
+			if [ "$SUBARCH" = "raspi" ]; then
+				# For now only raspi, but others are soon to follow
 				IMAGEFORMAT=ubuntu-image
 			else
 				IMAGEFORMAT=ext4
@@ -332,6 +332,11 @@ case $IMAGEFORMAT in
 				MODEL=pi3-arm64 ;;
 			armhf+cm3)
 				MODEL=cm3 ;;
+			armhf+raspi|arm64+raspi)
+				# Generic pi image - currently only for classic.  The resulting
+				# model name is 'pi3' temporarily, will be switched to pi once
+				# we merge the core and classic gadget into one.
+				MODEL=pi3
 			*)
 				echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
 				exit 1
@@ -893,12 +898,7 @@ case $ARCH in
 	armhf|arm64)
 		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
 		case $SUBARCH in
-			raspi2)
-				COMPONENTS='main restricted universe multiverse'
-				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
-				BINARY_REMOVE_LINUX=false
-				;;
-			raspi3)
+			raspi)
 				COMPONENTS='main restricted universe multiverse'
 				KERNEL_FLAVOURS=raspi2
 				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
@@ -976,12 +976,12 @@ echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
 echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary
 
 case $ARCH+$SUBARCH in
-	armhf+raspi2|armhf+raspi3|arm64+raspi3)
+	armhf+raspi|arm64+raspi)
 		cat > config/hooks/01-firmware-directory.chroot_early <<EOF
 #!/bin/sh -ex
 mkdir -p /boot/firmware
 EOF
-		cat > config/hooks/999-raspi2-fixes.chroot <<EOF
+		cat > config/hooks/999-raspi-fixes.chroot <<EOF
 #!/bin/sh -ex
 cat >> /etc/fstab << EOM
 LABEL=system-boot       /boot/firmware  vfat    defaults        0       1
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary
index 5884fe61..8585438e 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary
@@ -23,14 +23,6 @@ case $ARCH:$SUBARCH in
 		echo "We only create EFI images for $ARCH."
 		exit 0
 		;;
-	armhf:raspi2)
-		# matches the size of the snappy image
-		IMAGE_SIZE=$((4*1000*1000*1000))
-
-		BOOTPART_START=8192s
-		BOOTPART_END=138M
-		BOOT_MOUNTPOINT=/boot/firmware
-		;;
 	*)
 		;;
 esac
@@ -92,20 +84,6 @@ cp -a chroot/* mountpoint/
 
 setup_mountpoint mountpoint
 
-case $ARCH:$SUBARCH in
-	armhf:raspi2)
-		chroot mountpoint flash-kernel \
-			--machine "Raspberry Pi 2 Model B"
-		# not the best place for this, but neither flash-kernel nor
-		# u-boot have provisions for installing u-boot via maintainer
-		# script
-		${my_d}/raspi2/mkknlimg --dtok \
-			mountpoint/usr/lib/u-boot/rpi_2/u-boot.bin \
-			mountpoint/boot/firmware/uboot.bin
-		;;
-	*)	;;
-esac
-
 case $ARCH in
     amd64|i386) should_install_grub=1;;
              *) should_install_grub=0;;
diff --git a/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary b/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary
index c827a2a6..8dbbb9ae 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary
@@ -1,14 +1,5 @@
 #!/bin/bash -ex
 
-case $ARCH:$SUBARCH in
-	# Not sure if any other cloud images use subarch for something that
-	# should take qcow2 format, so only skipping this on raspi2 for now.
-	armhf:raspi2)
-		xz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
-	        exit 0
-		;;
-esac
-
 . config/functions
 
 if [ -f binary/boot/disk-uefi.ext4 ]; then
diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
index 561b4473..acac5ff9 100755
--- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
@@ -131,7 +131,7 @@ case $arch in
 	# ARM images are special
 	armhf|arm64)
 		# Dirty hack because SUBARCH doesn't exist when running chroot hooks,
-		# and we don't want raspi2 images to depend on a cloud data source:
+		# and we don't want raspi images to depend on a cloud data source:
 		if _xchroot "${rootd}" dpkg -l linux-image-raspi2 2>/dev/null | grep -q '^.i'; then
 			fake_cloud_init
 		fi