diff --git a/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/autostart.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/autostart.conf
index e4aba05..a044977 100644
--- a/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/autostart.conf
+++ b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/autostart.conf
@@ -3,9 +3,6 @@
 $polkit = /usr/libexec/kf6/polkit-kde-authentication-agent-1
 #$kwalletInit = exec --no-startup-id /usr/lib/pam_kwallet_init
 
-# menu bar
-exec-once = /usr/bin/waybar
-
 # hyprpaper
 # exec-once = hyprpaper
 
diff --git a/files/systemd/user/waybar.service b/files/systemd/user/waybar.service
new file mode 100644
index 0000000..a991743
--- /dev/null
+++ b/files/systemd/user/waybar.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Highly customizable Wayland bar for Sway and Wlroots based compositors.
+Documentation=man:waybar(5)
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=/usr/bin/waybar
+ExecReload=kill -SIGUSR2 $MAINPID
+Restart=on-failure
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target
\ No newline at end of file
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index 56452a1..c696c12 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -36,5 +36,10 @@ modules:
         - com.discordapp.Discord
     user: {} # Also add Flathub user repo, but no user packages
 
+  - type: systemd
+    user:
+      enabled:
+        - waybar.service
+
   - type: signing # this sets up the proper policy & signing files for signed images to work fully