diff --git a/desktop.yml b/desktop.yml
index 1a1ec8e..e12e615 100644
--- a/desktop.yml
+++ b/desktop.yml
@@ -3,3 +3,4 @@
   roles:
     - desktop
     - sway
+    - waybar
diff --git a/roles/desktop/handlers/main.yml b/roles/desktop/handlers/main.yml
index 95e1588..5cd8871 100644
--- a/roles/desktop/handlers/main.yml
+++ b/roles/desktop/handlers/main.yml
@@ -1,4 +1,2 @@
-- name: Restart waybar
-  shell: "killall waybar && waybar &"
 - name: Kill dunst
   shell: "killall dunst"
diff --git a/roles/desktop/tasks/main.yml b/roles/desktop/tasks/main.yml
index 2fcade0..a3ba1d0 100644
--- a/roles/desktop/tasks/main.yml
+++ b/roles/desktop/tasks/main.yml
@@ -1,5 +1,3 @@
-- name: Waybar
-  import_tasks: waybar.yml
 - name: Wofi
   import_tasks: wofi.yml
 - name: Dunst
diff --git a/roles/desktop/files/waybar.css b/roles/waybar/files/waybar.css
similarity index 100%
rename from roles/desktop/files/waybar.css
rename to roles/waybar/files/waybar.css
diff --git a/roles/desktop/files/waybar.jsonc b/roles/waybar/files/waybar.jsonc
similarity index 100%
rename from roles/desktop/files/waybar.jsonc
rename to roles/waybar/files/waybar.jsonc
diff --git a/roles/waybar/handlers/main.yml b/roles/waybar/handlers/main.yml
new file mode 100644
index 0000000..8564e52
--- /dev/null
+++ b/roles/waybar/handlers/main.yml
@@ -0,0 +1,2 @@
+- name: Restart waybar
+  shell: "killall waybar && waybar &"
diff --git a/roles/desktop/tasks/waybar.yml b/roles/waybar/tasks/main.yml
similarity index 100%
rename from roles/desktop/tasks/waybar.yml
rename to roles/waybar/tasks/main.yml