diff --git a/roles/desktop/tasks/main.yml b/roles/desktop/tasks/main.yml
index 4bdb8f2..0a68899 100644
--- a/roles/desktop/tasks/main.yml
+++ b/roles/desktop/tasks/main.yml
@@ -58,6 +58,11 @@
       update_cache: yes
       # One day
       cache_valid_time: 86400
+  - name: Remove packages
+    apt:
+      name:
+        - mpd
+      state: absent
   - name: Install packages
     apt:
       name:
@@ -133,7 +138,7 @@
         - mesa-vulkan-drivers
         - monodevelop
         - mpc
-        - mpd
+        - mopidy
         - mpv
         - mupen64plus-qt
         - nextcloud-desktop
@@ -208,8 +213,6 @@
       enabled: no
       state: stopped
     loop:
-      - mpd.socket
-      - mpd.service
       - motd-news.service
       - motd-news.timer
   - name: Start services