diff --git a/mkosi.extra/usr/lib/repart.sysinstall.d/00-esp.conf b/mkosi.extra/usr/lib/repart.sysinstall.d/00-esp.conf
new file mode 100644
index 00000000..81a884ef
--- /dev/null
+++ b/mkosi.extra/usr/lib/repart.sysinstall.d/00-esp.conf
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Partition]
+Type=esp
+Format=vfat
+SizeMinBytes=1G
+SizeMaxBytes=1G
diff --git a/mkosi.extra/usr/lib/repart.sysinstall.d/10-usr-verity-sig.conf b/mkosi.extra/usr/lib/repart.sysinstall.d/10-usr-verity-sig.conf
new file mode 120000
index 00000000..dc41fecb
--- /dev/null
+++ b/mkosi.extra/usr/lib/repart.sysinstall.d/10-usr-verity-sig.conf
@@ -0,0 +1 @@
+../repart.d/10-usr-verity-sig.conf
\ No newline at end of file
diff --git a/mkosi.extra/usr/lib/repart.sysinstall.d/11-usr-verity.conf b/mkosi.extra/usr/lib/repart.sysinstall.d/11-usr-verity.conf
new file mode 120000
index 00000000..46dbce19
--- /dev/null
+++ b/mkosi.extra/usr/lib/repart.sysinstall.d/11-usr-verity.conf
@@ -0,0 +1 @@
+../repart.d/11-usr-verity.conf
\ No newline at end of file
diff --git a/mkosi.extra/usr/lib/repart.sysinstall.d/12-usr.conf b/mkosi.extra/usr/lib/repart.sysinstall.d/12-usr.conf
new file mode 120000
index 00000000..30a8e254
--- /dev/null
+++ b/mkosi.extra/usr/lib/repart.sysinstall.d/12-usr.conf
@@ -0,0 +1 @@
+../repart.d/12-usr.conf
\ No newline at end of file
diff --git a/mkosi.extra/usr/lib/repart.sysinstall.d/20-usr-verity-sig.conf b/mkosi.extra/usr/lib/repart.sysinstall.d/20-usr-verity-sig.conf
new file mode 120000
index 00000000..5a3a5644
--- /dev/null
+++ b/mkosi.extra/usr/lib/repart.sysinstall.d/20-usr-verity-sig.conf
@@ -0,0 +1 @@
+../repart.d/20-usr-verity-sig.conf
\ No newline at end of file
diff --git a/mkosi.extra/usr/lib/repart.sysinstall.d/21-usr-verity.conf b/mkosi.extra/usr/lib/repart.sysinstall.d/21-usr-verity.conf
new file mode 120000
index 00000000..bcbdf818
--- /dev/null
+++ b/mkosi.extra/usr/lib/repart.sysinstall.d/21-usr-verity.conf
@@ -0,0 +1 @@
+../repart.d/21-usr-verity.conf
\ No newline at end of file
diff --git a/mkosi.extra/usr/lib/repart.sysinstall.d/22-usr.conf b/mkosi.extra/usr/lib/repart.sysinstall.d/22-usr.conf
new file mode 120000
index 00000000..1c2c2399
--- /dev/null
+++ b/mkosi.extra/usr/lib/repart.sysinstall.d/22-usr.conf
@@ -0,0 +1 @@
+../repart.d/22-usr.conf
\ No newline at end of file
diff --git a/mkosi.extra/usr/lib/repart.sysinstall.d/30-swap.conf b/mkosi.extra/usr/lib/repart.sysinstall.d/30-swap.conf
new file mode 120000
index 00000000..f491a179
--- /dev/null
+++ b/mkosi.extra/usr/lib/repart.sysinstall.d/30-swap.conf
@@ -0,0 +1 @@
+../repart.d/30-swap.conf
\ No newline at end of file
diff --git a/mkosi.extra/usr/lib/repart.sysinstall.d/40-root.conf b/mkosi.extra/usr/lib/repart.sysinstall.d/40-root.conf
new file mode 120000
index 00000000..fc0e98b9
--- /dev/null
+++ b/mkosi.extra/usr/lib/repart.sysinstall.d/40-root.conf
@@ -0,0 +1 @@
+../repart.d/40-root.conf
\ No newline at end of file
diff --git a/mkosi.extra/usr/lib/repart.sysinstall.d/50-home.conf b/mkosi.extra/usr/lib/repart.sysinstall.d/50-home.conf
new file mode 120000
index 00000000..b32235d3
--- /dev/null
+++ b/mkosi.extra/usr/lib/repart.sysinstall.d/50-home.conf
@@ -0,0 +1 @@
+../repart.d/50-home.conf
\ No newline at end of file
diff --git a/mkosi.uki-profiles/10-live.conf b/mkosi.uki-profiles/10-live.conf
index 50c18bad..b2eca904 100644
--- a/mkosi.uki-profiles/10-live.conf
+++ b/mkosi.uki-profiles/10-live.conf
@@ -3,19 +3,17 @@
 [UKIProfile]
 Profile=
         ID=live
-        TITLE=Live System (Installer)
+        TITLE=Live System
 
 Cmdline=
         root=tmpfs
         mount.usr=dissect
         rd.systemd.mask=systemd-repart.service
         systemd.mask=systemd-repart.service
-        systemd.firstboot=no
+        systemd.set-credential=passwd.plaintext-password.root:particleos
         systemd.set-credential=agetty.autologin:root
         systemd.set-credential=login.noauth:yes
         SYSTEMD_SULOGIN_FORCE=1
-        systemd.journald.forward_to_console=1
-        systemd.journald.max_level_console=warning
         rw
         audit=0
         systemd.image_policy=esp=unprotected:xbootldr=unprotected+unused+absent:usr=signed:=ignore
diff --git a/mkosi.uki-profiles/20-install.conf b/mkosi.uki-profiles/20-install.conf
new file mode 100644
index 00000000..cbf19a12
--- /dev/null
+++ b/mkosi.uki-profiles/20-install.conf
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[UKIProfile]
+Profile=
+        ID=install
+        TITLE=Installer
+
+Cmdline=
+        root=tmpfs
+        mount.usr=dissect
+        rd.systemd.mask=systemd-repart.service
+        systemd.mask=systemd-repart.service
+	systemd.unit=system-install.target
+	systemd.set-credential=passwd.plaintext-password.root:particleos
+        rw
+        audit=0
+        systemd.image_policy=esp=unprotected:xbootldr=unprotected+unused+absent:usr=signed:=ignore
+        systemd.image_filter=usr=ParticleOS_*:usr-verity=ParticleOS_*:usr-verity-sig=ParticleOS_*
+
+SignExpectedPcr=no