diff --git a/build.sh b/build.sh
index 62f07d3..9b4c5fb 100755
--- a/build.sh
+++ b/build.sh
@@ -42,6 +42,14 @@ pip install --prefix=/usr topgrade
 # Installed via flatpak
 rpm-ostree override remove firefox firefox-langpacks
 
+#### os-release
+
+sed -i '/fedoraproject.org/d' /usr/lib/os-release
+sed -i 's/Fedora Linux/Azure/g' /usr/lib/os-release
+sed -i 's/fedoraproject/babariviere/g' /usr/lib/os-release
+sed -i 's/fedora/azure/g' /usr/lib/os-release
+sed -i '/REDHAT/d' /usr/lib/os-release
+
 #### Quadlets
 
 mkdir -p /etc/containers/systemd/users
@@ -54,13 +62,15 @@ QUADLET_TARGETS=(
   "azure-cli"
 )
 for i in "${QUADLET_TARGETS[@]}"; do
-cat > "/usr/lib/systemd/user/${i}.target" <<EOF
+    cat > "/usr/lib/systemd/user/${i}.target" <<EOF
 [Unit]
-Description=${i}"target for ${i} quadlet
+Description="target for ${i} quadlet
 
 [Install]
 WantedBy=default.target
 EOF
+
+    printf "\n\n[Install]\nWantedBy=%s.target" "$i" >> /etc/containers/systemd/users/"$i".container
 done
 
 #### Setup niri deps
@@ -73,16 +83,12 @@ ln -s /usr/lib/systemd/user/kanshi.service /usr/lib/systemd/user/niri.service.wa
 
 #### Services
 
-# systemctl enable docker.socket
 systemctl enable podman.socket
 systemctl enable podman-auto-update.timer
-# systemctl enable tailscaled.service
-
-systemctl enable -f --global niri.service
+systemctl enable greetd.service
 
 systemctl enable -f --global flatpak-setup.service
 systemctl enable -f --global azure-topgrade.service
-systemctl enable -f --global azure-cli.target
 
 systemctl enable azure-system-setup.service
 systemctl enable azure-groups.service
diff --git a/files/etc/greetd/config.toml b/files/etc/greetd/config.toml
new file mode 100644
index 0000000..606333b
--- /dev/null
+++ b/files/etc/greetd/config.toml
@@ -0,0 +1,16 @@
+[terminal]
+# The VT to run the greeter on. Can be "next", "current" or a number
+# designating the VT.
+vt = 1
+
+# The default session, also known as the greeter.
+[default_session]
+
+# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
+# with whatever you want started, such as `sway`.
+command = "tuigreet --cmd 'bash -i -c niri-session'"
+
+# The user to run the command as. The privileges this user must have depends
+# on the greeter. A graphical greeter may for example require the user to be
+# in the `video` group.
+user = "greetd"
diff --git a/files/etc/profile.d/startniri.sh b/files/etc/profile.d/startniri.sh
deleted file mode 100644
index c628ed6..0000000
--- a/files/etc/profile.d/startniri.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
-    exec niri-session
-fi
diff --git a/packages b/packages
index 48b18ea..a860cb6 100644
--- a/packages
+++ b/packages
@@ -1,5 +1,8 @@
 # Compositor
 xorg-x11-server-Xwayland
+greetd
+greetd-selinux
+tuigreet
 niri
 
 # apps