diff --git a/CHANGELOG b/CHANGELOG
index c825662..0f1aa5e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,3 +49,6 @@
 * Update to synapse v1.0.0
 * Fixed url preview
 * Fixed voip
+
+[0.2.4]
+* Fixed federation
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 02711d4..e014c1a 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "standalone matrix server",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "memoryLimit": 536870912,
diff --git a/Dockerfile b/Dockerfile
index 30b07de..fc863e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,6 +38,8 @@ RUN pip3 install --upgrade setuptools
 RUN pip3 install psycopg2-binary python-ldap matrix-synapse-ldap3 lxml netaddr twisted jinja2 bleach bcrypt
 RUN pip3 install https://github.com/matrix-org/synapse/archive/${MATRIXVERSION}.tar.gz
 
+COPY index.html /app/code/nginx
+
 RUN chown -R www-data.www-data /app/code
 
 ADD start_matrix.sh /app/
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..2611ea3
--- /dev/null
+++ b/index.html
@@ -0,0 +1 @@
+<p>hi!</p>
diff --git a/nginx_matrix.conf b/nginx_matrix.conf
index 3f80cfe..cfccfde 100644
--- a/nginx_matrix.conf
+++ b/nginx_matrix.conf
@@ -5,17 +5,16 @@ server {
     server_name _;
 
     # required, else the limit is 1mb
-    client_max_body_size 20M;
-
-#    location /_matrix {
-#        proxy_pass http://localhost:8448;
-#        proxy_set_header X-Forwarded-For $remote_addr;
-#    }
+    client_max_body_size 200M;
 
     location / {
         proxy_pass http://localhost:8008;
         proxy_set_header X-Forwarded-For $remote_addr;
     }
 
-}
+    location /.well-known/matrix/server {
+        return 200 '{"m.server": "$host:443"}';
+        add_header Content-Type application/json;
+    }
 
+}
diff --git a/start_matrix.sh b/start_matrix.sh
index 07a7caf..8416226 100755
--- a/start_matrix.sh
+++ b/start_matrix.sh
@@ -65,15 +65,16 @@ if [[ ! -f /app/data/synapse/homeserver.yaml ]]; then
     sed -i "s/#url_preview_enabled:.*/url_preview_enabled: true/" homeserver.yaml
     sed -i "s/#url_preview_ip_range_blacklist.*/url_preview_ip_range_blacklist:\n  - '127.0.0.0\/8'\n  - '10.0.0.0\/8'/" homeserver.yaml
 
+    sed -i "s/## Server ##/## Server ##\n\nno_tls: True/" homeserver.yaml
 
     # also enable the tls port, not quite sure why this is needed, but without it, no integratiosn are possible
-    sed -i "s/#- port: 8448/- port: 8448/" homeserver.yaml
-    sed -i "s/#  type: http/  type: http/" homeserver.yaml
-    sed -i "s/#  tls: true/  tls: true/" homeserver.yaml
-    sed -i "s/#  resources:/  resources:/" homeserver.yaml
-    sed -i "s/#    - names: \[client, federation\]/    - names: \[client, federation\]/" homeserver.yaml
-    sed -i "s/#tls_certificate_path:/tls_certificate_path:/" homeserver.yaml
-    sed -i "s/#tls_private_key_path:/tls_private_key_path:/" homeserver.yaml
+    #sed -i "s/#- port: 8448/- port: 8448/" homeserver.yaml
+    #sed -i "s/#  type: http/  type: http/" homeserver.yaml
+    #sed -i "s/#  tls: true/  tls: true/" homeserver.yaml
+    #sed -i "s/#  resources:/  resources:/" homeserver.yaml
+    #sed -i "s/#    - names: \[client, federation\]/    - names: \[client, federation\]/" homeserver.yaml
+    #sed -i "s/#tls_certificate_path:/tls_certificate_path:/" homeserver.yaml
+    #sed -i "s/#tls_private_key_path:/tls_private_key_path:/" homeserver.yaml
 
 
     # get synapse log name and set path
@@ -118,6 +119,9 @@ if [[ ! -f /app/data/synapse/homeserver.yaml ]]; then
     sed -i 's/#   notif_template_text: .*/   notif_template_text: notif_mail.txt/' homeserver.yaml
     sed -i 's/#   notif_for_new_users: True/   notif_for_new_users: True/' homeserver.yaml
 
+    sed -i "s,#tls_fingerprints:.*,tls_fingerprints: [{sha256: \"${TLS_FINGERPRINT}\"}]," homeserver.yaml
+
+
 fi
 
 # logs