diff --git a/debian/changelog b/debian/changelog
index 71d6829c..e5997b7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.593) eoan; urgency=medium
+
+  * Use boot-partition for cloud-init seed on RPi
+
+ -- Dave Jones <dave.jones@canonical.com>  Thu, 06 Jun 2019 08:29:57 +0000
+
 livecd-rootfs (2.592) eoan; urgency=medium
 
   * Drop trying to mount removed maas squashfs.
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 33606a2a..561b4473 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
@@ -24,28 +24,13 @@ arch=$(_xchroot "${rootd}" dpkg --print-architecture)
 
 fake_cloud_init() {
     # If the cloud does not provide a meta-data service this should be run
-    # This will setup a nocloud datasource.
-
-    seed_d="${rootd}/var/lib/cloud/seed/nocloud-net"
-    mkdir -p "${seed_d}"
-
-    # fake instance-id
-    cat << EOF > "${seed_d}/meta-data"
-instance_id: cloud-image
-EOF
-
-    # fake user-data to create the default user/password
-    cat << EOF > "${seed_d}/user-data"
-#cloud-config
-password: ubuntu
-chpasswd: ubuntu
-ssh_pwauth: True
-EOF
-
-   # tell cloud-init not to look for meta-data sources
-   cat << EOF > ${rootd}/etc/cloud/cloud.cfg.d/99-fake_cloud.cfg
+    # This will setup a nocloud datasource on the boot partition.
+    cat << EOF > ${rootd}/etc/cloud/cloud.cfg.d/99-fake_cloud.cfg
 # configure cloud-init for NoCloud
 datasource_list: [ NoCloud, None ]
+datasource:
+  NoCloud:
+    fs_label: system-boot
 EOF
 }