diff --git a/default/wayland-sessions/omarchy.desktop b/default/wayland-sessions/omarchy.desktop
new file mode 100644
index 00000000..760181af
--- /dev/null
+++ b/default/wayland-sessions/omarchy.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Omarchy (Hyprland uwsm)
+Comment=Omarchy Hyprland session managed by uwsm
+Exec=uwsm start -g -1 -e -D Hyprland hyprland.desktop
+TryExec=uwsm
+Type=Application
diff --git a/install/login/sddm.sh b/install/login/sddm.sh
index a0366b3b..21696b48 100644
--- a/install/login/sddm.sh
+++ b/install/login/sddm.sh
@@ -2,16 +2,21 @@
 omarchy-refresh-sddm
 
 # Setup SDDM login service
+sudo mkdir -p /usr/local/share/wayland-sessions
+sudo cp "$OMARCHY_PATH/default/wayland-sessions/omarchy.desktop" /usr/local/share/wayland-sessions/omarchy.desktop
+
 sudo mkdir -p /etc/sddm.conf.d
 if [[ ! -f /etc/sddm.conf.d/autologin.conf ]]; then
   cat <<EOF | sudo tee /etc/sddm.conf.d/autologin.conf
 [Autologin]
 User=$USER
-Session=hyprland-uwsm
+Session=omarchy
 
 [Theme]
 Current=omarchy
 EOF
+else
+  sudo sed -i 's/^Session=hyprland-uwsm$/Session=omarchy/' /etc/sddm.conf.d/autologin.conf
 fi
 
 # Prevent password-based SDDM logins from creating an encrypted login keyring
diff --git a/migrations/1777396666.sh b/migrations/1777396666.sh
new file mode 100644
index 00000000..ea8e4326
--- /dev/null
+++ b/migrations/1777396666.sh
@@ -0,0 +1,8 @@
+echo "Use Omarchy UWSM session without graphical.target startup wait"
+
+sudo mkdir -p /usr/local/share/wayland-sessions
+sudo cp "$OMARCHY_PATH/default/wayland-sessions/omarchy.desktop" /usr/local/share/wayland-sessions/omarchy.desktop
+
+if [[ -f /etc/sddm.conf.d/autologin.conf ]]; then
+  sudo sed -i 's/^Session=hyprland-uwsm$/Session=omarchy/' /etc/sddm.conf.d/autologin.conf
+fi