diff --git a/roles/mpd/files/mpd-service-override.conf b/roles/mpd/files/mpd-service-override.conf
deleted file mode 100644
index f45a782..0000000
--- a/roles/mpd/files/mpd-service-override.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=/usr/bin/firejail /usr/bin/mpd --no-daemon
diff --git a/roles/mpd/files/mpd.service b/roles/mpd/files/mpd.service
new file mode 100644
index 0000000..c0d82bc
--- /dev/null
+++ b/roles/mpd/files/mpd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Music Player Daemon
+After=network.target sound.target
+
+[Service]
+ExecStart=/usr/bin/firejail /usr/bin/mpd --no-daemon
+
+# allow MPD to use real-time priority 50
+LimitRTPRIO=50
+LimitRTTIME=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/roles/mpd/tasks/main.yml b/roles/mpd/tasks/main.yml
index ca0be4a..2a26f75 100644
--- a/roles/mpd/tasks/main.yml
+++ b/roles/mpd/tasks/main.yml
@@ -16,13 +16,8 @@
   tags:
     - firejail
 
-- name: Create mpd systemd unit file directory
-  file: path=/etc/systemd/user/mpd.service.d state=directory
-  tags:
-    - firejail
-
-- name: Push mpd socket unit file
-  copy: src=mpd-service-override.conf dest=/etc/systemd/user/mpd.service.d/override.conf
+- name: Push mpd service file
+  copy: src=mpd.service dest=/etc/systemd/user/mpd.service
   notify:
     - reload systemd config
   tags: