diff --git a/mkosi.profiles/gnome-kiosk/mkosi.conf b/mkosi.profiles/gnome-kiosk/mkosi.conf
new file mode 100644
index 00000000..8c7291b6
--- /dev/null
+++ b/mkosi.profiles/gnome-kiosk/mkosi.conf
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# Requires desktop profile
+
+[Match]
+Distribution=fedora
+
+[Content]
+Packages=
+        gdm
+        gnome-kiosk-script-session
+        gnome-text-editor
diff --git a/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/lib/systemd/system-preset/05-particleos-kiosk.preset b/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/lib/systemd/system-preset/05-particleos-kiosk.preset
new file mode 100644
index 00000000..d29e8fd8
--- /dev/null
+++ b/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/lib/systemd/system-preset/05-particleos-kiosk.preset
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+disable systemd-homed-firstboot.service
+enable gdm.service
diff --git a/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/lib/sysusers.d/10-particleos-kiosk.conf b/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/lib/sysusers.d/10-particleos-kiosk.conf
new file mode 100644
index 00000000..f8cec658
--- /dev/null
+++ b/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/lib/sysusers.d/10-particleos-kiosk.conf
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+#Type Name       ID                  GECOS              Home directory Shell
+u     kiosk      -                   "Kiosk"            /home/kiosk    /sbin/nologin
diff --git a/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/lib/tmpfiles.d/10-particleos-kiosk.conf b/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/lib/tmpfiles.d/10-particleos-kiosk.conf
new file mode 100644
index 00000000..18a593f3
--- /dev/null
+++ b/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/lib/tmpfiles.d/10-particleos-kiosk.conf
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+#Type Path                                     Mode User Group Age         Argument
+d     /home/kiosk                              0700 kiosk kiosk - -
+d     /var/lib/AccountsService/users           0700 root root - -
+C     /var/lib/AccountsService/users/kiosk     0600 root root - -
diff --git a/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/share/factory/etc/gdm/custom.conf b/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/share/factory/etc/gdm/custom.conf
new file mode 100644
index 00000000..114372bd
--- /dev/null
+++ b/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/share/factory/etc/gdm/custom.conf
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[daemon]
+AutomaticLoginEnable=true
+AutomaticLogin=kiosk
+
+[security]
+
+[xdmcp]
+
+[chooser]
+
+[debug]
+# Uncomment the line below to turn on debugging
+#Enable=true
diff --git a/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/share/factory/var/lib/AccountsService/users/kiosk b/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/share/factory/var/lib/AccountsService/users/kiosk
new file mode 100644
index 00000000..0e95365d
--- /dev/null
+++ b/mkosi.profiles/gnome-kiosk/mkosi.extra/usr/share/factory/var/lib/AccountsService/users/kiosk
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[User]
+Session=gnome-kiosk-script-wayland
+SystemAccount=false