diff --git a/build.sh b/build.sh
index ebc5569..11fa3bd 100755
--- a/build.sh
+++ b/build.sh
@@ -75,7 +75,7 @@ build () {
     YYYYMMDD="$(date +%Y%m%d%H%M)"
     OUTPUT_DIR="$BASE_DIR/builds/$BUILD_ARCH"
     mkdir -p "$OUTPUT_DIR"
-    FNAME="ubuntudde-$VERSION-$BUILD_ARCH-$YYYYMMDD-$OUTPUT_SUFFIX"
+    FNAME="ubuntu-sway-$VERSION-$BUILD_ARCH-$YYYYMMDD-$OUTPUT_SUFFIX"
     mv "$BASE_DIR/tmp/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso"
 
     md5sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.md5.txt"
diff --git a/etc/config/archives/ubuntu-sway.key b/etc/config/archives/ubuntu-sway.key
new file mode 100644
index 0000000..5ed4f16
--- /dev/null
+++ b/etc/config/archives/ubuntu-sway.key
@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Use "gpg --dearmor" for unpacking
+
+AAAAIAEBAAJLQlhmAAAAAGJT2DBiU9gwAAAAAAAAAAAAAAUWAgEAAAAAAF4AAASk
+AAEAHL35u3fKU9AmeltwTVWJGU5dfOvZAAAAIAAAAAAAAAABAAwAAAJ+AAAAHQAA
+AAAAAQAEAAAAAAAAAAAAAAAAAAAAAGJT2DAAAAAAmQINBGJTyJ4BEADacFFXD51y
+1TDIxD+1/kU9xVM1xF6Fj05j6XBUW86DG2pQOgBL0+k2K0UYEoHZpGT9VoLH4V46
+yGFjodpzPUsPHt4BJGNpaqRteJbV0MUvLHJJnWEyx+aX0DKcszL+Nq0QLycEI4h4
+nbM9zbqQUmw2qYLNwse60wwNwJaHo+vagSWqCRlcBUfJjp+IP2YulcCJ3EQnqdiy
+V8C+HHKgYVZb9b/hMuElM7FbX26kLTCUb/wJI7ZbLw5neK5c3R6vWkcLiT58fd+F
+Fxdex/8P83+rI/N/iTZYN+F1FhMgZ/pbJO3dnNh+OUH4a0Aw6VC5oQ7luu+wWv1U
+unD5liYsJB+Fb6j7d4mt4K00HGGRoafTowvqgaN7Q/SUng54AXNHcspdPVJ89gTi
+mWxR9EMvF8Oen8aWj9hTqlhWe3gH/oxL1vmBoos/94O3v7dzbqS1R7rI+ZmvmBfG
+i5fIxyhZnRcnvHrq6hbRq+hpRqiK4NnN95hmHt4avvVieN9WyRkD8MhOYhAUvwlj
+nNIp+OWgjrdpx7Zse5ZBt4x8rt48a3lpRDcxogR6BVkaKFgp/N/9V4o3N56zkp9h
+xc0my86wQ4pEuH43AAbt3yUTpAwrIZC0sZ4X8h3f00SG5jxMfeaAT+1aoJpE2vYm
+bVIC7wOXqXXXCLhRTthD6q91C/NRvw4IbwARAQABsAwAAGdwZwEAAAAAAAC0HUxh
+dW5jaHBhZCBQUEEgZm9yIFVidW50dSBTd2F5sAwAAGdwZwIAAAAAAACJAk4EEwEK
+ADgWIQS9+bt3ylPQJnpbcE1ViRlOXXzr2QUCYlPIngIbAwULCQgHAgYVCgkICwIE
+FgIDAQIeAQIXgAAKCRBViRlOXXzr2TgbD/0VUMD7QtYtkb3/jS2b7lPWRi335jen
+tEaAViP1k8mMdq/bKuiwZ4DYBR5eI/J8kJuZZLa0QMCDNGacAfTn/t7XlLWDDCft
+n746df6j8BZjzXzdygPRE8TTi8FYQKY7mVmL9eqeG7Y12V43qwB6eJtJeUbZcXA+
+CmMwBpgQWKwvZJNxqZJXO3BPXJFXeva+3ADRtNOXaMy0p3nsjZZ6G1PsWb2g8jJA
+PhqWvF3h5B0MM3j4X1ME/RhANzFN1evhoN/kXT9UzrDOxkkVFZ5xT4kLf9HXDttP
+FjxBZxKLnTWGsWAn5P7vE7MFKBjN9cu5KdZIclPgzBV2bJQ9fq9C4XiNR9ljROqG
+mNSYXLfxQxZ9wwlC6qAKVFZ7VKdl+Nq4ACwHehcCWag0Ow5D7jo8hymZ1K1EWNiJ
+SMJVXlbDSKOXR12wjCqqBAJItq3uS2W6i8JeslrzSoGEAS6baQayJ85Q/Zy4vLkd
+lVXKcXtiqomHYk+2LeY9DMw7IA2jhTmU8EE8nRtTdOZPnjrJSIRxfZ3R3D9YXxyS
+NF87MhV8H4ot2u+4d6Q8VfhW15ORRXkZsklH9GygX9k6KSzMP/C7J3BAqtjr7i3N
+oJ3yQ5FM07wxvfVxr6s4XjG9E2bt0blGQ06I3F1/AXuuWyJr8a8imHjnorAbpYyv
+fkKZ8OZ/P4kguLAGAANncGcACqxB3OSraMlsnQx65Bj0if9uB5k=
+=gd+3
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/etc/config/archives/ubuntu-sway.list b/etc/config/archives/ubuntu-sway.list
index 8d1c8b6..94a53fd 100644
--- a/etc/config/archives/ubuntu-sway.list
+++ b/etc/config/archives/ubuntu-sway.list
@@ -1 +1 @@
- 
+deb https://ppa.launchpadcontent.net/ubuntu-sway/stable/ubuntu jammy main
diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_install b/etc/config/package-lists.calamares/desktop.list.chroot_install
index 7f9a2da..dfb3d9a 100644
--- a/etc/config/package-lists.calamares/desktop.list.chroot_install
+++ b/etc/config/package-lists.calamares/desktop.list.chroot_install
@@ -1 +1,2 @@
+ubuntu-minimal
 ubuntu-sway-desktop
diff --git a/etc/config/package-lists.calamares/desktop.list.chroot_live b/etc/config/package-lists.calamares/desktop.list.chroot_live
index 9815830..448ede8 100644
--- a/etc/config/package-lists.calamares/desktop.list.chroot_live
+++ b/etc/config/package-lists.calamares/desktop.list.chroot_live
@@ -1,7 +1,7 @@
 casper
 expect
 gparted
-calamares-settings-ubuntu-sway
+calamares-settings-ubuntusway
 cifs-utils
 lupin-casper
 language-pack-en
diff --git a/etc/terraform.conf b/etc/terraform.conf
index 689f312..23dbcf4 100644
--- a/etc/terraform.conf
+++ b/etc/terraform.conf
@@ -18,7 +18,7 @@ VERSION="22.04"
 CHANNEL="stable"
 
 # distribution name
-NAME="Ubuntu Sway"
+NAME="Ubuntu Sway Remix"
 
 # mirror to fetch packages from
 MIRROR_URL="http://archive.ubuntu.com/ubuntu/"