diff --git a/roles/docker/tasks/services/mastodon.yml b/roles/docker/tasks/services/mastodon.yml
index a44a5f0..3faf488 100644
--- a/roles/docker/tasks/services/mastodon.yml
+++ b/roles/docker/tasks/services/mastodon.yml
@@ -1,18 +1,33 @@
 # vim: ft=yaml.ansible
 ---
-- name: create mastodon volume folders
+- name: Create volume folder for Mastodon data
   file:
-    name: "{{ services.mastodon.volume_folder }}/{{ volume }}"
+    name: "{{ services.mastodon.volume_folder }}/mastodon_data"
     state: directory
     owner: "991"
-    group: "991"
-  loop:
-    - "postgres_data"
-    - "postgres_config"
-    - "redis_data"
-    - "mastodon_data"
-  loop_control:
-    loop_var: volume
+    mode: u=rwx,g=rx,o=rx
+
+- name: Create volume folder for PostgreSQL data
+  file:
+    name: "{{ services.mastodon.volume_folder }}/postgres_data"
+    state: directory
+    owner: "70"
+    mode: u=rwx,go=
+
+- name: Create volume folder for PostgreSQL config
+  file:
+    name: "{{ services.mastodon.volume_folder }}/postgres_config"
+    state: directory
+    owner: root
+    mode: u=rwx,g=rx,o=rx
+
+- name: Create volume folder for Redis data
+  file:
+    name: "{{ services.mastodon.volume_folder }}/redis_data"
+    state: directory
+    owner: "999"
+    group: "1000"
+    mode: u=rwx,g=rx,o=rx
 
 - name: Copy mastodon environment file
   template: