diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
deleted file mode 100644
index 7df1a6c..0000000
--- a/group_vars/all/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Matrix configuration
-matrix_domain_name: "matrix.n39.eu"
-matrix_admin_password: "{{ lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}" 
\ No newline at end of file
diff --git a/host-pottwal.yml b/host-pottwal.yml
index faa71f5..a836dcb 100644
--- a/host-pottwal.yml
+++ b/host-pottwal.yml
@@ -41,13 +41,10 @@
         # RabbitMQ setup can be found in the inventory
     - role: netz39.matrix_synapse
       vars:
-        matrix_server_name: "{{ matrix_domain_name }}"
-        matrix_database_host: "localhost"
-        matrix_register_admin: true
-        matrix_admin_password: "{{ matrix_admin_password }}"
-        matrix_ssl_enabled: true
-        matrix_ssl_cert_path: "/etc/letsencrypt/live/{{ matrix_domain_name }}/fullchain.pem"
-        matrix_ssl_key_path: "/etc/letsencrypt/live/{{ matrix_domain_name }}/privkey.pem"
+        matrix_data_path: "{{ data_dir }}/matrix/data"
+        matrix_media_path: "{{ data_dir }}/matrix/media"
+        matrix_postgres_data_path: "{{ data_dir }}/matrix/postgres"
+        matrix_http_port: "{{ matrix_host_port }}"
 
   tasks:
 
@@ -636,6 +633,14 @@
       tags:
         - homebox
 
+    - name: Setup proxy site "{{ matrix_domain_name }}"
+      ansible.builtin.include_role:
+        name: setup_http_site_proxy
+      vars:
+        site_name: "{{ matrix_domain_name }}"
+        proxy_port: "{{ matrix_host_port }}"
+      tags: ["matrix"]
+
     - name: Setup proxy site spaceapi.n39.eu
       ansible.builtin.template:
         src: templates/pottwal/spaceapi-apache-site.j2
diff --git a/host_vars/pottwal.n39.eu/vars.yml b/host_vars/pottwal.n39.eu/vars.yml
index 854fb67..2303074 100644
--- a/host_vars/pottwal.n39.eu/vars.yml
+++ b/host_vars/pottwal.n39.eu/vars.yml
@@ -63,3 +63,11 @@ renovate_image: renovate/renovate:39.220.1
 renovate_forgejo_pat: "{{ vault_renovate_forgejo_pat }}"
 renovate_github_pat: "{{ vault_renovate_github_pat }}"
 renovate_git_user: "Renovate Bot <accounts+renovatebot@netz39.de>"
+
+matrix_host_port: 8008
+matrix_domain_name: matrix.n39.eu
+matrix_docker_image: matrixdotorg/synapse:v1.128.0
+matrix_postgres_docker_image: postgres:17.4-alpine
+matrix_database_password: "{{ vault_matrix_database_password }}" 
+matrix_register_admin: true
+matrix_admin_password: "{{ vault_matrix_admin_password }}" 
\ No newline at end of file