diff --git a/forward/public/.db.finallycoffee.eu.swp b/forward/public/.db.finallycoffee.eu.swp
new file mode 100644
index 0000000..8e434c0
Binary files /dev/null and b/forward/public/.db.finallycoffee.eu.swp differ
diff --git a/forward/public/db.finallycoffee.eu b/forward/public/db.finallycoffee.eu
index d8aec99..05cdbab 100644
--- a/forward/public/db.finallycoffee.eu
+++ b/forward/public/db.finallycoffee.eu
@@ -11,7 +11,8 @@ $TTL	604800
 
 	IN	NS	munich.finallycoffee.eu.
 	IN	NS	london.finallycoffee.eu.
-	IN	NS	karlsruhe.finallycoffee.eu.
+	IN	NS	amsterdam.finallycoffee.eu.
+;	IN	NS	karlsruhe.finallycoffee.eu.
 
 ; Hosts
 
@@ -22,12 +23,15 @@ london.finallycoffee.eu.	IN	AAAA	2a06:8ec0:3::1:7fee
 munich.finallycoffee.eu.	IN	A	173.249.45.89
 munich.finallycoffee.eu.	IN	AAAA	2a02:c207:3003:6854::1
 
-iodine.finallycoffee.eu.	IN	A	78.94.228.62
-argon.finallycoffee.eu.		IN	A	185.122.57.156
-argon.finallycoffee.eu.		IN	AAAA	2a06:8ec0:3::1:7fee
+amsterdam.finallycoffee.eu.	IN	A	185.185.40.86
+amsterdam.finallycoffee.eu.	IN	AAAA	2a0b:7080:10::1:96cf
 
-vps.finallycoffee.eu.		IN	A	173.249.45.89
-vps.finallycoffee.eu.		IN	AAAA	2a02:c207:3003:6854::1
+;iodine.finallycoffee.eu.	IN	A	78.94.228.62
+;argon.finallycoffee.eu.		IN	A	185.122.57.156
+;argon.finallycoffee.eu.		IN	AAAA	2a06:8ec0:3::1:7fee
+
+;vps.finallycoffee.eu.		IN	A	173.249.45.89
+;vps.finallycoffee.eu.		IN	AAAA	2a02:c207:3003:6854::1
 
 ; Services
 
@@ -36,8 +40,8 @@ chat				IN	CNAME	karlsruhe.finallycoffee.eu.
 matrix				IN	CNAME	karlsruhe.finallycoffee.eu.
 dimension.matrix		IN	CNAME	karlsruhe.finallycoffee.eu.
 
-_matrix._tcp.matrix		IN	SRV	10 0 8448 matrix
-_matrix-identity._tcp.matrix	IN	SRV	10 0 443 matrix
+_matrix._tcp.matrix		IN	SRV	10 0 8448 matrix.finallycoffee.eu.
+_matrix-identity._tcp.matrix	IN	SRV	10 0 443 matrix.finallycoffee.eu.
 
 
 ; Private cloud
@@ -52,16 +56,16 @@ ci				IN	CNAME	karlsruhe.finallycoffee.eu.
 
 ; Infrastructure
 ipa				IN	CNAME	karlsruhe.finallycoffee.eu.
-ldap				IN	CNAME	vps.finallycoffee.eu.
+ldap				IN	CNAME	munich.finallycoffee.eu.
 dsl.gateway			IN	CNAME	karlsruhe.finallycoffee.eu.
 docsis.gateway			IN	CNAME	karlsruhe.finallycoffee.eu.
 
-_ldap._tcp.ldap			IN	SRV	10 5 636 vps.finallycoffee.eu.
+_ldap._tcp.ldap			IN	SRV	10 5 636 munich.finallycoffee.eu.
 
 
 ; Gaming servers
-_minecraft._tcp.dw20.feedthebeast		IN	SRV	10 5 25569 karlsruhe.finallycoffee.eu
-_minecraft._tcp.sevtech-ages.feedthebeast	IN	SRV	10 5 25568 karlsruhe.finallycoffee.eu
-_minecraft._tcp.skyfactory3.feedthebeast	IN	SRV	10 5 25567 karlsruhe.finallycoffee.eu
-_minecraft._tcp.creative.minecraft		IN	SRV	10 5 25566 karlsruhe.finallycoffee.eu
-_minecraft._tcp.survival.minecraft		IN	SRV	10 5 25565 karlsruhe.finallycoffee.eu
+_minecraft._tcp.dw20.feedthebeast		IN	SRV	10 5 25569 karlsruhe.finallycoffee.eu.
+_minecraft._tcp.sevtech-ages.feedthebeast	IN	SRV	10 5 25568 karlsruhe.finallycoffee.eu.
+_minecraft._tcp.skyfactory3.feedthebeast	IN	SRV	10 5 25567 karlsruhe.finallycoffee.eu.
+_minecraft._tcp.creative.minecraft		IN	SRV	10 5 25566 karlsruhe.finallycoffee.eu.
+_minecraft._tcp.survival.minecraft		IN	SRV	10 5 25565 karlsruhe.finallycoffee.eu.