diff --git a/webserver/docker_matrix/tasks/main.yml b/webserver/docker_matrix/tasks/main.yml
index 8982c824352fece7ad8525e531e0302a7066ae96..6d961148f2394085e7178d6f7d17dfd2f113e0ce 100644
--- a/webserver/docker_matrix/tasks/main.yml
+++ b/webserver/docker_matrix/tasks/main.yml
@@ -29,16 +29,17 @@
     - mxisd-config/mxisd.yaml
     - synapse-data/homeserver.log.config
     - synapse-data/homeserver.yaml
+    - synapse-data/synapse-1.9.0-ldap-fix.patch
   register: configs
 
 
 - name: stop matrix docker
-  docker_service:
+  docker_compose:
     project_src: /srv/matrix/
     state: absent
   when: configs.changed
 
 - name: start matrix docker
-  docker_service:
+  docker_compose:
     project_src: /srv/matrix/
     state: present
diff --git a/webserver/docker_matrix/templates/Dockerfile b/webserver/docker_matrix/templates/Dockerfile
index e53e8e071de9ad70e93c7492143b7318baf33ce8..0f28cf67a60a69efec172e67ef6ed71857cf8637 100644
--- a/webserver/docker_matrix/templates/Dockerfile
+++ b/webserver/docker_matrix/templates/Dockerfile
@@ -3,3 +3,7 @@ FROM matrixdotorg/synapse:v1.9.0-py3
 RUN apk add curl 
 RUN export PYTHON_MINOR_VERSION=$(echo "${PYTHON_VERSION}" | rev | cut -d"." -f2-  | rev) ; \
     curl https://raw.githubusercontent.com/kamax-matrix/matrix-synapse-rest-auth/master/rest_auth_provider.py -o /usr/local/lib/python${PYTHON_MINOR_VERSION}/site-packages/rest_auth_provider.py
+
+# Fix Synapse 1.9.0 Problem: https://github.com/matrix-org/synapse/issues/6772
+COPY synapse-data/synapse-1.9.0-ldap-fix.patch /synapse-1.9.0-ldap-fix.patch 
+RUN cd /usr/local/lib/python3.7/site-packages/synapse/module_api && patch < /synapse-1.9.0-ldap-fix.patch
diff --git a/webserver/docker_matrix/templates/docker-compose.yml b/webserver/docker_matrix/templates/docker-compose.yml
index 2402fd6394283fb8dbf5e8db35a68fb93cfda627..77aca756a17fd145b2ed4a408e830eb50682e893 100644
--- a/webserver/docker_matrix/templates/docker-compose.yml
+++ b/webserver/docker_matrix/templates/docker-compose.yml
@@ -30,7 +30,8 @@ services:
       SYNAPSE_CONFIG_PATH: "/data/homeserver.yaml" 
 
   mxisd:
-
+    
+    # TODO: Migrate to https://github.com/ma1uta/ma1sd
     image: kamax/mxisd:1.4.6
     restart: always
     ports:
diff --git a/webserver/docker_matrix/templates/synapse-data/synapse-1.9.0-ldap-fix.patch b/webserver/docker_matrix/templates/synapse-data/synapse-1.9.0-ldap-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..45b0a13c96a101ff090b62946ecdccdf871f9705
--- /dev/null
+++ b/webserver/docker_matrix/templates/synapse-data/synapse-1.9.0-ldap-fix.patch
@@ -0,0 +1,10 @@
+--- __init__.py
++++ __init__.py
+@@ -37,6 +37,7 @@ class ModuleApi(object):
+ 
+     def __init__(self, hs, auth_handler):
+         self._hs = hs
++        self.hs = hs
+ 
+         self._store = hs.get_datastore()
+         self._auth = hs.get_auth()
\ No newline at end of file