diff --git a/autostart/walker.desktop b/autostart/walker.desktop
new file mode 100644
index 00000000..fa7bdfe2
--- /dev/null
+++ b/autostart/walker.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Walker
+Comment=Walker Service
+Exec=walker --gapplication-service
+StartupNotify=false
+Terminal=false
+Type=Application
diff --git a/bin/omarchy-restart-walker b/bin/omarchy-restart-walker
index 1b5f4ea1..d888fa03 100755
--- a/bin/omarchy-restart-walker
+++ b/bin/omarchy-restart-walker
@@ -12,11 +12,10 @@ if [[ $EUID -eq 0 ]]; then
   # Restart services as the script owner
   systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
     bash -c "
-      setsid uwsm-app -- elephant &
-      setsid uwsm-app -- walker --gapplication-service &
+      systemctl --user restart elephant.service
+      systemctl --user restart app-walker@autostart.service
     "
 else
-  setsid uwsm-app -- elephant &
-  wait 2
-  setsid uwsm-app -- walker --gapplication-service &
+  systemctl --user restart elephant.service
+  systemctl --user restart app-walker@autostart.service
 fi
diff --git a/default/hypr/autostart.conf b/default/hypr/autostart.conf
index 8588ac6f..0462f73a 100644
--- a/default/hypr/autostart.conf
+++ b/default/hypr/autostart.conf
@@ -6,8 +6,6 @@ exec-once = uwsm-app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = uwsm-app -- swayosd-server
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = omarchy-cmd-first-run
-exec-once = uwsm-app -- elephant
-exec-once = uwsm-app -- walker --gapplication-service
 
 # Slow app launch fix -- set systemd vars
 exec-once = systemctl --user import-environment $(env | cut -d'=' -f 1)
diff --git a/migrations/1762873545.sh b/migrations/1762873545.sh
new file mode 100644
index 00000000..da7c6d9a
--- /dev/null
+++ b/migrations/1762873545.sh
@@ -0,0 +1,6 @@
+pkill elephant
+elephant service enable
+systemctl --user start elephant.service
+
+mkdir -p ~/.config/autostart/
+cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/