diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 9e3326695..1c202cdf2 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -573,6 +573,15 @@ matrix_synapse_ext_encryption_config_yaml: |
   patch_power_levels: {{ matrix_synapse_ext_encryption_disabler_patch_power_levels|to_json }}
 
 
+# Matrix-Org Synapse S3 Media Store Integration
+
+# 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.
+matrix_synapse_s3_media_store_enabled: false
+
+
+# Goofys S3 Integration
 matrix_s3_media_store_enabled: false
 matrix_s3_media_store_custom_endpoint_enabled: false
 matrix_s3_goofys_docker_image: "ewoutp/goofys:latest"
diff --git a/roles/matrix-synapse/tasks/synapse/setup_install.yml b/roles/matrix-synapse/tasks/synapse/setup_install.yml
index 2302a6f23..899fea452 100644
--- a/roles/matrix-synapse/tasks/synapse/setup_install.yml
+++ b/roles/matrix-synapse/tasks/synapse/setup_install.yml
@@ -39,6 +39,14 @@
     - name: Ensure Synapse Docker image is built
       shell:
         chdir: "{{ matrix_synapse_docker_src_files_path }}"
+        # Adding the Installcommand for https://github.com/matrix-org/synapse-s3-storage-provider
+        # to the Dockerfile https://github.com/matrix-org/synapse-s3-storage-provider/issues/14#issuecomment-847146994
+        - name: Adding the S3 Install Command
+          lineinfile:
+            path: docker/Dockerfile
+            line: RUN pip install --prefix="/install" --no-deps --no-warn-script-location synapse-s3-storage-provider
+            insertafter: /synapse.*
+            when: "matrix_synapse_s3_media_store_enabled|bool"
         cmd: |
           {{ matrix_host_command_docker }} build \
           -t "{{ matrix_synapse_docker_image }}" \
@@ -47,7 +55,7 @@
       environment:
         DOCKER_BUILDKIT: 1
       when: "matrix_synapse_git_pull_results.changed|bool or matrix_synapse_docker_image_check_result.stdout == ''"
-  when: "matrix_synapse_container_image_self_build|bool"
+  when: "matrix_synapse_container_image_self_build|bool or matrix_synapse_s3_media_store_enabled|bool"
 
 - name: Ensure Synapse Docker image is pulled
   docker_image: