diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 4cda8fb7d..1ce497846 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -578,9 +578,13 @@ matrix_synapse_ext_encryption_config_yaml: |
 # The S3 Integration requires the installation directly in the Synapse container.
 # So there is a need to build our own Synapse container.
 # So with setting matrix_synapse_s3_media_store_enabled to true the matrix_synapse_container_image_self_build is overwritten.
+# All configuration options are avaliable here: https://github.com/matrix-org/synapse-s3-storage-provider
 matrix_synapse_s3_media_store_enabled: false
-matrix_synapse_s3_media_store_local: true
+# Save media on local media store
+matrix_synapse_s3_media_store_local: false
+# Save media on remote media store
 matrix_synapse_s3_media_store_remote: true
+# Synchronous upload 
 matrix_synapse_s3_media_store_sync: true
 
 matrix_synapse_s3_media_store_bucket: ""
@@ -588,6 +592,8 @@ matrix_synapse_s3_media_store_region: "eu-central-1"
 matrix_synapse_s3_media_store_endpoint: "https://s3.{{ matrix_synapse_s3_media_store_region }}.amazonaws.com"
 matrix_synapse_s3_media_store_access: ""
 matrix_synapse_s3_media_store_key: ""
+matrix_synapse_s3_media_store_storage_class: "STANDARD"
+matrix_synapse_s3_media_store_threads: "20"
 
 
 
diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
index ae185b93d..3e8ac4795 100644
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -1054,6 +1054,8 @@ media_storage_providers:
     endpoint_url: {{ matrix_synapse_s3_media_store_endpoint }}
     access_key_id: {{ matrix_synapse_s3_media_store_access }}
     secret_access_key: {{ matrix_synapse_s3_media_store_key }}
+    storage_class: {{ matrix_synapse_s3_media_store_storage_class }}
+    threadpool_size: {{ matrix_synapse_s3_media_store_threads }}
 {% endif %}
 
 # The largest allowed upload size in bytes