diff --git a/tasks/clean.yaml b/tasks/clean.yaml
index ed97d53..8f02efd 100644
--- a/tasks/clean.yaml
+++ b/tasks/clean.yaml
@@ -1 +1,14 @@
 ---
+
+- name: disable and stop eralitex vdesk user service
+  systemd:
+    name: eralitex@:16.service
+    state: stopped
+    enabled: false
+    scope: user
+  failed_when: false
+
+- name: remove eralitex user service
+  file:
+    path: ~/.config/systemd/user/eralitex@.service
+    state: absent
diff --git a/tasks/main.yaml b/tasks/main.yaml
index c91e126..f0f3a79 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -20,3 +20,14 @@
 
 - import_tasks: vdesk.yaml
   when: home_desktop
+
+- name: flush handlers
+  meta: flush_handlers
+
+- name: enable and start vdesk user service
+  systemd:
+    name: vdesk@:16.service
+    state: started
+    enabled: true
+    scope: user
+  when: home_vdesk_started_and_enabled
diff --git a/tasks/vdesk.yaml b/tasks/vdesk.yaml
index 4d8b7de..385b8bf 100644
--- a/tasks/vdesk.yaml
+++ b/tasks/vdesk.yaml
@@ -2,17 +2,6 @@
 
 - name: vdesk user service
   template:
-    src: eralitex-vdesk.service.j2
-    dest: ~/.config/systemd/user/eralitex@.service
+    src: vdesk.service.j2
+    dest: ~/.config/systemd/user/vdesk@.service
   notify: systemd daemon-reload
-
-- name: flush handlers
-  meta: flush_handlers
-
-- name: enable and start eralitex vdesk user service
-  systemd:
-    name: eralitex@:16.service
-    state: started
-    enabled: true
-    user: true
-  when: home_vdesk_started_and_enabled
diff --git a/templates/eralitex-vdesk.service.j2 b/templates/vdesk.service.j2
similarity index 100%
rename from templates/eralitex-vdesk.service.j2
rename to templates/vdesk.service.j2