diff --git a/matrix.sh b/matrix.sh
index e21d555..ce5593a 100644
--- a/matrix.sh
+++ b/matrix.sh
@@ -1,7 +1,18 @@
 #!/bin/bash
 
+# Authors:
+# (C) 2021 Idea an concept by Christian Zengel <christian@sysops.de>
+# (C) 2021 Script design and prototype by Markus Helmke <helmke@cloudistboese.de>
+# (C) 2021 Script rework by Thorsten Spille <thorsten@spille-edv.de>
+
 source ./zamba.conf
 
+# Set Timezone
+ln -sf /usr/share/zoneinfo/$LXC_TIMEZONE /etc/localtime
+
+# configure system language
+dpkg-reconfigure locales
+
 MRX_PKE=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
 
 ELE_DBNAME="synapse_db"