diff --git a/build.sh b/build.sh
index 62f07d3..5ae719e 100755
--- a/build.sh
+++ b/build.sh
@@ -54,13 +54,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
 
 [Install]
 WantedBy=default.target
 EOF
+    mkdir "/usr/lib/systemd/user/${i}.target.wants"
+    ln -s /etc/containers/systemd/users/azure-cli.container "/usr/lib/systemd/user/${i}.target.wants/"
 done
 
 #### Setup niri deps
@@ -73,12 +75,9 @@ 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
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..d9c8af0 100644
--- a/packages
+++ b/packages
@@ -1,5 +1,6 @@
 # Compositor
 xorg-x11-server-Xwayland
+greetd
 niri
 
 # apps