diff --git a/tasks/desktop-apps.yaml b/tasks/desktop-apps.yaml
index f32e356..3ac6667 100644
--- a/tasks/desktop-apps.yaml
+++ b/tasks/desktop-apps.yaml
@@ -7,33 +7,23 @@
     mode: 0755
   notify: systemd daemon-reload
 
-- name: autostart terminal
+- name: enable autostart desktop apps
   systemd:
-    name: desktop-app@{{default_terminal}}.service
-    enabled: "{{ home_autostart_terminal }}"
+    name: desktop-app@{{ app.command }}.service
+    enabled: true
     scope: user
+  loop: "{{ home_autostart_desktop_apps | json_query(\"[?enabled]\") }}"
+  loop_control:
+    label: "{{ app.name }}"
+    loop_var: app
 
-- name: autostart nm-applet
+- name: disable autostart desktop apps
   systemd:
-    name: desktop-app@nm-applet.service
-    enabled: "{{ home_autostart_nm_applet }}"
-    scope: user
-
-- name: autostart blueman-applet
-  systemd:
-    name: desktop-app@blueman-applet.service
-    enabled: "{{ home_autostart_blueman_applet }}"
-    scope: user
-
-- name: autostart pasystray
-  systemd:
-    name: desktop-app@pasystray.service
-    enabled: "{{ home_autostart_pasystray }}"
-    scope: user
-  when:
-
-- name: autostart unclutter
-  systemd:
-    name: desktop-app@unclutter.service
-    enabled: "{{ home_autostart_unclutter }}"
+    name: desktop-app@{{ app.command }}.service
+    enabled: false
     scope: user
+  loop: "{{ home_autostart_desktop_apps | json_query(\"[?!enabled]\") }}"
+  loop_control:
+    label: "{{ app.name }}"
+    loop_var: app
+  failed_when: false
diff --git a/vars/main.yaml b/vars/main.yaml
index 16691f0..f4f39db 100644
--- a/vars/main.yaml
+++ b/vars/main.yaml
@@ -1,3 +1,21 @@
+home_autostart_desktop_apps:
+  - name: terminal
+    command: "{{default_terminal}}"
+    enabled: "{{ home_autostart_terminal }}"
+  - name: network manager applet
+    command: nm-applet
+    enabled: "{{ home_autostart_nm_applet }}"
+  - name: bluetooth manager applet
+    command: blueman-applet
+    enabled: "{{ home_autostart_blueman_applet }}"
+  - name: pulseaudio applet
+    command: pasystray
+    enabled: "{{ home_autostart_pasystray }}"
+  - name: mouse pointer hiding
+    command: unclutter
+    enabled: "{{ home_autostart_unclutter }}"
+
+
 i3_number_workspace_keymaps:
   - keysym: 1
     workspace: 1