diff --git a/tasks/mpd.yml b/tasks/mpd.yml
index 0673104..569a263 100644
--- a/tasks/mpd.yml
+++ b/tasks/mpd.yml
@@ -1,52 +1,63 @@
-- name: copy systemd configuration files
-  template:
+- name: Copy systemd configuration files
+  ansible.builtin.template:
     src: '{{ item.src }}'
     dest: '{{ item.dest }}'
+    mode: '0644'
   loop:
-    - {
-        src: 'templates/mpd/service.j2',
-        dest: '{{ xdg_config_dir }}/systemd/user/mpd.service',
-      }
-    - {
-        src: 'templates/mpd/socket.j2',
-        dest: '{{ xdg_config_dir }}/systemd/user/mpd.socket',
-      }
+    - src: 'templates/mpd/service.j2'
+      dest: '{{ xdg_config_dir }}/systemd/user/mpd.service'
+
+    - src: 'templates/mpd/socket.j2'
+      dest: '{{ xdg_config_dir }}/systemd/user/mpd.socket'
   notify:
     - stop mpd service
     - restart mpd socket
 
-- name: create mpd files
-  file:
+- name: Create mpd files
+  ansible.builtin.file:
     path: '{{ item.path }}'
     state: '{{ item.state }}'
+    mode: '0644'
   loop:
-    - { path: '{{ mpd_configuration_dir }}', state: 'directory' }
-    - { path: '{{ ncmpc_configuration_dir }}', state: 'directory' }
-    - { path: '{{ ncmpcpp_configuration_dir }}', state: 'directory' }
-    - { path: '{{ mpd_configuration_dir }}/playlists', state: 'directory' }
-    - { path: '{{ mpd_configuration_dir }}/state', state: 'touch' }
+    - path: '{{ mpd_configuration_dir }}'
+      state: 'directory'
+    - path: '{{ ncmpc_configuration_dir }}'
+      state: 'directory'
+    - path: '{{ ncmpcpp_configuration_dir }}'
+      state: 'directory'
+    - path: '{{ mpd_configuration_dir }}/playlists'
+      state: 'directory'
+    - path: '{{ mpd_configuration_dir }}/state'
+      state: 'touch'
 
-- name: remove previous mpd files
-  file:
+- name: Remove previous mpd files
+  ansible.builtin.file:
     path: '{{ item.path }}'
     state: '{{ item.state }}'
+    mode: '0644'
+    recurse: '{{ item.path is directory }}'
   loop:
-    - { path: '{{ mpd_configuration_dir }}/log', state: 'absent' }
-    - { path: '{{ mpd_configuration_dir }}/database', state: 'absent' }
-    - { path: '{{ mpd_configuration_dir }}/sticker.sql', state: 'absent' }
+    - path: '{{ mpd_configuration_dir }}/log'
+      state: 'absent'
+    - path: '{{ mpd_configuration_dir }}/database'
+      state: 'absent'
+    - path: '{{ mpd_configuration_dir }}/sticker.sql'
+      state: 'absent'
+    - path: '{{ ncmpc_configuration_dir }}'
+      state: 'absent'
 
-- name: copy configuration files
-  template:
+- name: Copy configuration files
+  ansible.builtin.template:
     src: '{{ item.src }}'
     dest: '{{ item.dest }}'
+    mode: '0644'
   loop:
-    - { src: 'templates/mpd/mpd.conf.j2', dest: '{{ mpd_configuration_dir }}/mpd.conf' }
-    - { src: 'templates/mpd/ncmpc.j2', dest: '{{ ncmpc_configuration_dir }}/config' }
-    - { src: 'templates/mpd/ncmpcpp/config.j2', dest: '{{ ncmpcpp_configuration_dir }}/config' }
-    - {
-        src: 'templates/mpd/ncmpcpp/bindings.j2',
-        dest: '{{ ncmpcpp_configuration_dir }}/bindings'
-      }
+    - src: 'templates/mpd/mpd.conf.j2'
+      dest: '{{ mpd_configuration_dir }}/mpd.conf'
+    - src: 'templates/mpd/ncmpcpp/config.j2'
+      dest: '{{ ncmpcpp_configuration_dir }}/config'
+    - src: 'templates/mpd/ncmpcpp/bindings.j2'
+      dest: '{{ ncmpcpp_configuration_dir }}/bindings'
   notify:
     - stop mpd service