diff --git a/roles/music/handlers/main.yaml b/roles/music/handlers/main.yaml
index 18e7f74..f6507f0 100644
--- a/roles/music/handlers/main.yaml
+++ b/roles/music/handlers/main.yaml
@@ -58,9 +58,9 @@
     state: restarted
     daemon_reload: true
 
-- name: Restart soundboard
+- name: restart mqtt-soundboard
   ansible.builtin.systemd:
-    name: soundboard
+    name: mqtt-soundboard
     state: restarted
     daemon_reload: true
 
diff --git a/roles/music/tasks/soundboard.yaml b/roles/music/tasks/soundboard.yaml
index 1b72dbf..92619b1 100644
--- a/roles/music/tasks/soundboard.yaml
+++ b/roles/music/tasks/soundboard.yaml
@@ -6,25 +6,23 @@
       - mplayer
     state: present
 
-- ansible.builtin.file:
-    path: "{{ item }}"
-    state: absent
-  with_items:
-    - /opt/soundboard
-    - /etc/systemd/system/soundboard.service
-
 - name: Install soundboard config file
   ansible.builtin.template:
-    src: soundboard.yaml
-    dest: /etc/soundboard.yaml
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
     owner: root
     group: root
     mode: 0644
-  notify: Restart soundboard
+  notify: restart mqtt-soundboard
+  with_items:
+    - src: mqtt-soundboard.service
+      dest: /etc/systemd/system/mqtt-soundboard.service
+    - src: mqtt-soundboard.yaml
+      dest: /etc/mqtt-soundboard.yaml
 
 - name: Enable soundboard
   ansible.builtin.systemd:
-    name: soundboard
+    name: mqtt-soundboard
     state: started
     enabled: true
     daemon_reload: true
diff --git a/roles/music/templates/soundboard.service b/roles/music/templates/mqtt-soundboard.service
similarity index 51%
rename from roles/music/templates/soundboard.service
rename to roles/music/templates/mqtt-soundboard.service
index 38b31ab..4429bfa 100644
--- a/roles/music/templates/soundboard.service
+++ b/roles/music/templates/mqtt-soundboard.service
@@ -6,12 +6,11 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=/opt/soundboard/.venv/bin/python /opt/soundboard/soundboard.py /etc/soundboard.yaml
+ExecStart=/lib/python3/dist-packages/mqtt-soundboard.py /etc/mqtt-soundboard.yaml
 Restart=always
 RestartSec=10
-User=audio
-LimitMEMLOCK=infinity
-LimitRTPRIO=99
+User=root
+Environment="XDG_RUNTIME_DIR=/run/user/{{ music_audio_user_id }}"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/music/templates/soundboard.yaml b/roles/music/templates/mqtt-soundboard.yaml
similarity index 81%
rename from roles/music/templates/soundboard.yaml
rename to roles/music/templates/mqtt-soundboard.yaml
index 106dc30..9056002 100644
--- a/roles/music/templates/soundboard.yaml
+++ b/roles/music/templates/mqtt-soundboard.yaml
@@ -1,13 +1,13 @@
 # {{ ansible_managed }}
 
-loglevel: INFO
+loglevel: DEBUG
 
 mqtt:
   host: {{ mqtt_internal_host }}
 
 sounds:
   directory: /opt/sounds
-  play_cmd: "mplayer -volume 10 -ao jack:name=MPlayer %s"
+  play_cmd: "pw-jack mplayer -volume 20 -ao jack:name=MPlayer %s"
   topic: bitlair/soundboard
 
 aliases: