diff --git a/forward/public/db.finallycoffee.eu b/forward/public/db.finallycoffee.eu
index 27161cb..a24f028 100644
--- a/forward/public/db.finallycoffee.eu
+++ b/forward/public/db.finallycoffee.eu
@@ -32,10 +32,8 @@ chat				IN	CNAME	karlsruhe.finallycoffee.eu.
 matrix				IN	CNAME	karlsruhe.finallycoffee.eu.
 dimension.matrix		IN	CNAME	karlsruhe.finallycoffee.eu.
 
-_matrix._tcp			IN	SRV	10 0 8448 matrix.finallycoffee.eu.
-_matrix._tcp			IN	SRV	20 0 8448 munich.finallycoffee.eu.
+_matrix._tcp			IN	SRV	10 0 443 matrix.finallycoffee.eu.
 _matrix-identity._tcp		IN	SRV	10 0 443 matrix.finallycoffee.eu.
-_matrix-identity._tcp		IN	SRV	20 0 443 munich.finallycoffee.eu.
 
 ; Matrix test env
 
@@ -49,7 +47,7 @@ _matrix-identity._tcp.matrix-qa		IN	SRV	10 0 443 matrix-qa.finallycoffee.eu.
 ; Private cloud
 cloud				IN	CNAME	karlsruhe.finallycoffee.eu.
 office.cloud			IN	CNAME	karlsruhe.finallycoffee.eu.
-pad.cloud			IN	CNAME	munich.finallycoffee.eu.
+pad.cloud			IN	CNAME	karlsruhe.finallycoffee.eu.
 
 ; Social media
 social				IN	CNAME	munich.finallycoffee.eu.
@@ -67,6 +65,7 @@ blackbox.stats			IN	CNAME	munich.finallycoffee.eu.
 ipa				IN	CNAME	karlsruhe.finallycoffee.eu.
 ldap				IN	CNAME	munich.finallycoffee.eu.
 admin				IN	CNAME	karlsruhe.finallycoffee.eu.
+gateway				IN	CNAME	karlsruhe.finallycoffee.eu.
 dsl.gateway			IN	CNAME	karlsruhe.finallycoffee.eu.
 docsis.gateway			IN	CNAME	karlsruhe.finallycoffee.eu.