diff --git a/roles/matrix-server/tasks/main.yml b/roles/matrix-server/tasks/main.yml
index 9d54d86c..088bd495 100644
--- a/roles/matrix-server/tasks/main.yml
+++ b/roles/matrix-server/tasks/main.yml
@@ -1,10 +1,5 @@
 ---
 
-- include: tasks/setup_s3fs.yml
-  tags:
-    - setup-main
-    - setup-s3fs
-
 - include: tasks/setup_base.yml
   tags:
     - setup-main
@@ -23,6 +18,11 @@
     - setup-main
     - setup-postgres
 
+- include: tasks/setup_s3fs.yml
+  tags:
+    - setup-main
+    - setup-s3fs
+
 - include: tasks/setup_synapse.yml
   tags:
     - setup-main