diff --git a/build-rpi.sh b/build-rpi.sh
index 76309f0..1afe0be 100755
--- a/build-rpi.sh
+++ b/build-rpi.sh
@@ -21,7 +21,7 @@ update-binfmts --enable
 rootdir=$(pwd)
 basedir=$(pwd)/artifacts/ubuntusway-rpi
 
-export packages="ubuntusway-minimal ubuntusway-desktop ubuntusway-standard"
+export packages="ubuntu-sway-minimal ubuntu-sway-desktop ubuntu-sway-standard"
 export architecture="arm64"
 export codename="lunar"
 export channel="dev"
diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_install b/etc/config/package-lists.calamares/desktop.list.chroot_install
index 3285cc4..3d1dbd0 100644
--- a/etc/config/package-lists.calamares/desktop.list.chroot_install
+++ b/etc/config/package-lists.calamares/desktop.list.chroot_install
@@ -1,5 +1,5 @@
-ubuntusway-desktop
-ubuntusway-minimal
-ubuntusway-standard
+ubuntu-sway-desktop
+ubuntu-sway-minimal
+ubuntu-sway-standard
 
 @XORG_HWE
diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_live b/etc/config/package-lists.calamares/desktop.list.chroot_live
index 161b7b6..4e5744b 100644
--- a/etc/config/package-lists.calamares/desktop.list.chroot_live
+++ b/etc/config/package-lists.calamares/desktop.list.chroot_live
@@ -1,4 +1,4 @@
-ubuntusway-live
+ubuntu-sway-live
 ntfs-3g
 fwupdate
 shim-signed