diff --git a/debian/changelog b/debian/changelog
index 802b0804..fa8e3f9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+livecd-rootfs (2.777) kinetic; urgency=medium
+
+  * Rename FK_FORCE_CONTAINER into FK_FORCE as its role was extended to also
+    support chroot (LP: #1989194).
+
+ -- Alexandre Ghiti <alexandre.ghiti@canonical.com>  Thu, 08 Sep 2022 16:25:36 +0200
+
+livecd-rootfs (2.776) kinetic; urgency=medium
+
+  * Do not modify /etc/ssh/sshd_config for ubuntu-cpc project
+    builds. (LP: #1968873). The cloud-init bug (LP #1968873) got
+    fixed so using a config snippet now.
+
+ -- Thomas Bechtold <thomas.bechtold@canonical.com>  Tue, 23 Aug 2022 10:45:06 +0200
+
 livecd-rootfs (2.775) kinetic; urgency=medium
 
   [ Rudra Saraswat ]
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
index f516e7a6..aaf4e401 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
@@ -231,7 +231,7 @@ install_grub() {
                         # This explains why we install flash-kernel here.
                         chroot mountpoint mkdir -p /etc/flash-kernel/
                         chroot mountpoint bash -c "echo 'Allwinner D1 Nezha' > /etc/flash-kernel/machine"
-                        chroot mountpoint bash -c 'FK_FORCE_CONTAINER=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
+                        chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
                         efi_target=riscv64-efi
 
                         chroot mountpoint apt-get install -qqy nezha-boot0
@@ -265,7 +265,7 @@ install_grub() {
                         # This explains why we install flash-kernel here.
                         chroot mountpoint mkdir -p /etc/flash-kernel/
                         chroot mountpoint bash -c "echo 'StarFive VisionFive V1' > /etc/flash-kernel/machine"
-                        chroot mountpoint bash -c 'FK_FORCE_CONTAINER=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
+                        chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
                         efi_target=riscv64-efi
 
                         # factory u-boot requires a p3 partition with /boot/uEnv.txt file
diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot
index 6b0a34ea..4db6efe0 100755
--- a/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot
@@ -1,3 +1,8 @@
 #!/bin/bash
 
-sed -i "s|#PasswordAuthentication yes|PasswordAuthentication no|g" /etc/ssh/sshd_config
+# NOTE: the file number needs to be **higher** than the one
+# cloud-init writes (cloud-init uses 50-cloud-init.conf) so
+# the cloud-init file takes precedence
+cat << EOF >> "/etc/ssh/sshd_config.d/60-cloudimg-settings.conf"
+PasswordAuthentication no
+EOF