diff --git a/conf/zamba.conf.example b/conf/zamba.conf.example
index 2885a7e..459538f 100644
--- a/conf/zamba.conf.example
+++ b/conf/zamba.conf.example
@@ -112,6 +112,12 @@ MATRIX_FQDN="matrix.zmb.rocks"
 # Define the FQDN for the Element Web virtual host
 MATRIX_ELEMENT_FQDN="element.zmb.rocks"
 
+# Define the administrative user of matrix service
+MATRIX_ADMIN_USER="admin"
+
+# Define the admin password
+MATRIX_ADMIN_PASSWORD="Start!123"
+
 ############### Nextcloud-Section ###############
 
 # Define the FQDN of your Nextcloud server
diff --git a/src/matrix/constants-service.conf b/src/matrix/constants-service.conf
index 3737735..da80d37 100644
--- a/src/matrix/constants-service.conf
+++ b/src/matrix/constants-service.conf
@@ -8,7 +8,7 @@
 # This file contains the project constants on service level
 
 # Debian Version, which will be installed
-LXC_TEMPLATE_VERSION="debian-10-standard"
+LXC_TEMPLATE_VERSION="debian-11-standard"
 
 # Create sharefs mountpoint
 LXC_MP="0"
@@ -20,4 +20,4 @@ LXC_UNPRIVILEGED="1"
 LXC_NESTING="1"
 
 # Define the version of Element Web
-MATRIX_ELEMENT_VERSION="v1.7.25"
+MATRIX_ELEMENT_VERSION="v1.9.8"
diff --git a/src/matrix/install-service.sh b/src/matrix/install-service.sh
index 80d5fff..1283d5b 100644
--- a/src/matrix/install-service.sh
+++ b/src/matrix/install-service.sh
@@ -87,7 +87,7 @@ cat > /etc/nginx/sites-available/$MATRIX_ELEMENT_FQDN <<EOF
 server {
     listen 80;
     listen [::]:80;
-    server_name $MATRIX_ELEMENT_FQDN;
+    server_name _;
     return 301 https://$MATRIX_ELEMENT_FQDN;
 }
 
@@ -107,6 +107,7 @@ server {
 
 EOF
 
+unlink /etc/nginx/sites-enabled/default
 ln -s /etc/nginx/sites-available/$MATRIX_ELEMENT_FQDN /etc/nginx/sites-enabled/$MATRIX_ELEMENT_FQDN
 
 systemctl restart nginx
@@ -136,19 +137,17 @@ EOF
 cd /
 sed -i "s|#registration_shared_secret: <PRIVATE STRING>|registration_shared_secret: \"$MRX_PKE\"|" /etc/matrix-synapse/homeserver.yaml
 sed -i "s|#public_baseurl: https://example.com/|public_baseurl: https://$MATRIX_FQDN/|" /etc/matrix-synapse/homeserver.yaml
+sed -i "s|server_name:|server_name: $MATRIX_FQDN|g" /etc/matrix-synapse/conf.d/server_name.yaml
 sed -i "s|#enable_registration: false|enable_registration: true|" /etc/matrix-synapse/homeserver.yaml
 sed -i "s|name: sqlite3|name: psycopg2|" /etc/matrix-synapse/homeserver.yaml
 sed -i "s|database: /var/lib/matrix-synapse/homeserver.db|database: $ELE_DBNAME\n    user: $ELE_DBUSER\n    password: $ELE_DBPASS\n    host: 127.0.0.1\n    cp_min: 5\n    cp_max: 10|" /etc/matrix-synapse/homeserver.yaml
 
 systemctl restart matrix-synapse
 
-register_new_matrix_user -c /etc/matrix-synapse/homeserver.yaml http://127.0.0.1:8008
+register_new_matrix_user -a -u $MATRIX_ADMIN_USER -p '$MATRIX_ADMIN_PASSWORD' -c /etc/matrix-synapse/homeserver.yaml http://127.0.0.1:8008
 
 #curl https://download.jitsi.org/jitsi-key.gpg.key | sh -c 'gpg --dearmor > /usr/share/keyrings/jitsi-keyring.gpg'
 #echo 'deb [signed-by=/usr/share/keyrings/jitsi-keyring.gpg] https://download.jitsi.org stable/' | tee /etc/apt/sources.list.d/jitsi-stable.list > /dev/null
 
 #apt update
-#apt install -y jitsi-meet
-
-
-
+#apt install -y jitsi-meet
\ No newline at end of file