diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml
index e4be0a4..4acd111 100644
--- a/ansible/inventory/group_vars/all.yml
+++ b/ansible/inventory/group_vars/all.yml
@@ -22,6 +22,8 @@ nfs_shares:
     path: /mnt/data/seafile/data
   - name: seafile_db
     path: /mnt/data/seafile/db
+  - name: mastodon_system
+    path: /mnt/data/mastodon/system
 
 database_passwords:
   nextcloud: !vault |
@@ -40,3 +42,11 @@ database_passwords:
     3533666462303563360a313233306335396234393932396331313238376464363964363839396164
     66366662356135343035363935616664613831626131376330643133313530636431613266636165
     6265613666616164373637356235396165383662333561393939
+  mastodon: !vault |
+    $ANSIBLE_VAULT;1.1;AES256
+    63616366396665663161376161373735626466353464393963333136336335376662326232613639
+    6166333137376131633761623163306165386562666639640a313136386431373161306331626638
+    34643433396232383962643964386631313632393161316261353331346163333261336666646563
+    6232666231653732630a396638396462323464613033306662313463663262626430363432663465
+    63623935303861663565633739363539326435623561396535623034663735373232336633303037
+    6266323136316238343963613332396261346337646264646162
diff --git a/ansible/roles/mastodon/docker-stack.yml.j2 b/ansible/roles/mastodon/docker-stack.yml.j2
index d76bc92..9aa6b21 100644
--- a/ansible/roles/mastodon/docker-stack.yml.j2
+++ b/ansible/roles/mastodon/docker-stack.yml.j2
@@ -8,6 +8,11 @@ networks:
 
 volumes:
   cache:
+  system:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.30.10,nolock,soft,rw"
+      device: ":/mnt/data/mastodon/system"
 
 services:
   db:
@@ -73,9 +78,11 @@ services:
       - db
       - redis
     volumes:
-      - type: bind
-        source: /mnt/data/mastodon/public/system
+      - type: volume
+        source: system
         target: /mastodon/public/system
+        volume:
+          nocopy: true
       - cache:/mastodon/public/system/cache
     deploy:
       placement:
@@ -134,9 +141,11 @@ services:
     networks:
       - mastodon
     volumes:
-      - type: bind
-        source: /mnt/data/mastodon/public/system
+      - type: volume
+        source: system
         target: /mastodon/public/system
+        volume:
+          nocopy: true
       - cache:/mastodon/public/system/cache
     healthcheck:
       test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]