diff --git a/roles/matrix-synapse/tasks/setup_synapse.yml b/roles/matrix-synapse/tasks/setup_synapse.yml
index 60b02d559..b565a4d2d 100644
--- a/roles/matrix-synapse/tasks/setup_synapse.yml
+++ b/roles/matrix-synapse/tasks/setup_synapse.yml
@@ -1,9 +1,5 @@
 ---
 
-- set_fact:
-    matrix_synapse_media_store_parent_path: "{{ matrix_synapse_media_store_path|dirname }}"
-    matrix_synapse_media_store_directory_name: "{{ matrix_synapse_media_store_path|basename }}"
-
 - name: Ensure Synapse paths exist
   file:
     path: "{{ item }}"
diff --git a/roles/matrix-synapse/vars/main.yml b/roles/matrix-synapse/vars/main.yml
index 3b5ab8544..bb0a06f25 100644
--- a/roles/matrix-synapse/vars/main.yml
+++ b/roles/matrix-synapse/vars/main.yml
@@ -7,3 +7,6 @@ matrix_synapse_federation_api_url_endpoint_public: "https://{{ matrix_server_fqn
 
 # Tells whether this role had executed or not. Toggled to `true` during runtime.
 matrix_synapse_role_executed: false
+
+matrix_synapse_media_store_parent_path: "{{ matrix_synapse_media_store_path|dirname }}"
+matrix_synapse_media_store_directory_name: "{{ matrix_synapse_media_store_path|basename }}"