diff --git a/.ansible-lint b/.ansible-lint
index 1ad596e4..e750c579 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -3,11 +3,7 @@ skip_list:
   - "name[casing]"
 
 exclude_paths:
-  - .ansible/
   - .forgejo/
   - "**/*.sops.yaml"
   - ansible_collections/
-  - collections/
   - galaxy_roles/
-  - docs/
-  - resources/
diff --git a/.yamllint.yaml b/.yamllint.yaml
index bf9c1e24..7ad950c9 100644
--- a/.yamllint.yaml
+++ b/.yamllint.yaml
@@ -1,6 +1,5 @@
 rules:
   brackets:
-    forbid: false
     min-spaces-inside: 1
     max-spaces-inside: 1
     min-spaces-inside-empty: 1
diff --git a/inventories/chaosknoten/host_vars/matrix-sync.sops.yaml b/inventories/chaosknoten/host_vars/matrix-sync.sops.yaml
index 79b70e20..c2427295 100644
--- a/inventories/chaosknoten/host_vars/matrix-sync.sops.yaml
+++ b/inventories/chaosknoten/host_vars/matrix-sync.sops.yaml
@@ -1,6 +1,4 @@
 ansible_pull__age_private_key: ENC[AES256_GCM,data:/+Ub9S/CRrSAeWX9cXzIMHjmDXwAh7hPSzXDnSh8iIZMJg+zW9c7mHqJV5B1AtDp9EQ+pSKpC1TdWuM0qGUABIi+cgZolWISXiI=,iv:lfHLyKsIgNhSm1pVERHT+2uMsP8PP8A49C9OAGsYkL0=,tag:AHRK8KuJJCZst+MsS3wXsw==,type:str]
-matrix_sync__matrix_access_token: ENC[AES256_GCM,data:GCrbVRoAKaNR0ToedY0mf11YYsIXgKgP+xhPYKJ8+5Sc8iXjTLCyWIw=,iv:DpbIRKAno+GWbBnOfVLvCJYAjlTHVVMeROZKOGaeP88=,tag:UMWTY51aHR7SNK4G2YcrpQ==,type:str]
-matrix_sync__keycloak_client_secret: ENC[AES256_GCM,data:5+NoUs/9QbxoUCJQwDTb4CqvRHP0ktXd9hEkfXoKx2Vgmd86Aqy6tv+ozrBh7LQVPurpSCnIkG6hSlQpjXs4WsXu6oarV2c4TsSWXFmsCpJPhmIIL0Q=,iv:cq6sd6eAwMsWve8rhyiI1v1O4jW7Xh4fH3H5zGAO4bQ=,tag:LVucuziDh2OgNzaof1qQGA==,type:str]
 sops:
   age:
     - enc: |
@@ -32,8 +30,8 @@ sops:
         qIJBztm2souvOZDMZSmbhKRptvwVcjIUrZ09uNqAWe+j22gYNlQMtQ==
         -----END AGE ENCRYPTED FILE-----
       recipient: age1q7kz3pnfq6cvtn56rlfgs52efcvtcmaq4xny0va3x5wxj4vpgccsenwxk6
-  lastmodified: "2026-10-08T12:40:22Z"
-  mac: ENC[AES256_GCM,data:6wKdBHTiBpqQ9F7xzt/DZpI/2D76O5ymdDDCl7gtvTL5rpCxMZyr4Ol/nlWqb2bbAVJPVdgBBVHPes6ENVNVhEXb45jZ/Dl2wAEwVfeso+VXOR2LKN1U6WU55G0tovZZlVxfI85tednSNXc9i0+2JQSEZsifUPU10KXITFMVjmY=,iv:tUcAObEkMWMC/RG2GbC7ev0O/JyobrkGZnGYJ7YYAhM=,tag:SDB4u+M1GytTMXLprX0ENw==,type:str]
+  lastmodified: "2026-10-08T12:20:28Z"
+  mac: ENC[AES256_GCM,data:3EAY9S9ZYjjXmqpV0DOZvc1ANHi4P2EhLM+WURsZPE0r1P8YDR0bAxbqilrCbm4U6WznACNfcoyn2esFy63t4va/TyVnLWfukqCUF0+xjd2ICMYTMsT2vzQDFDsBE1RDVJrWuCPC+hsZzBO0cRHrUBRgbWFuDa3eZHXxJl8YAWU=,iv:qNmzrSxrPozOSlh6re/czhUwnfgvAZfn9JQNADSqf3I=,tag:hQAb/WM1ytg3Avomt22P5A==,type:str]
   pgp:
     - created_at: "2026-10-08T12:18:55Z"
       enc: |-
diff --git a/inventories/chaosknoten/host_vars/matrix-sync.yaml b/inventories/chaosknoten/host_vars/matrix-sync.yaml
index 58318093..5b845582 100644
--- a/inventories/chaosknoten/host_vars/matrix-sync.yaml
+++ b/inventories/chaosknoten/host_vars/matrix-sync.yaml
@@ -1,6 +1 @@
-docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2') }}"
-docker_compose__configuration_files:
-  - name: "!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I"
-    content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/matrix-sync/docker_compose/config/!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I') }}"
-  - name: "!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs"
-    content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/matrix-sync/docker_compose/config/!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs') }}"
+# tbd
diff --git a/inventories/chaosknoten/hosts.yaml b/inventories/chaosknoten/hosts.yaml
index feedc3bf..8880311e 100644
--- a/inventories/chaosknoten/hosts.yaml
+++ b/inventories/chaosknoten/hosts.yaml
@@ -165,7 +165,6 @@ docker_compose_hosts:
     sunders:
     spaceapiccc:
     draupnir:
-    matrix-sync:
 nextcloud_hosts:
   hosts:
     cloud:
@@ -258,7 +257,6 @@ infrastructure_authorized_keys_hosts:
     lists:
     forgejo-runner:
     forgejo-runner-external:
-    matrix-sync:
 wiki_hosts:
   hosts:
     eh22-wiki:
@@ -299,7 +297,6 @@ ansible_pull_hosts:
     auth-dns:
     forgejo-runner:
     forgejo-runner-external:
-    matrix-sync:
 msmtp_hosts:
   hosts:
 renovate_hosts:
diff --git a/resources/chaosknoten/draupnir/docker_compose/compose.yaml b/resources/chaosknoten/draupnir/docker_compose/compose.yaml
index e346c6bb..42bf8fda 100644
--- a/resources/chaosknoten/draupnir/docker_compose/compose.yaml
+++ b/resources/chaosknoten/draupnir/docker_compose/compose.yaml
@@ -3,7 +3,7 @@
 
 services:
   draupnir:
-    image: ghcr.io/the-draupnir-project/draupnir:v3.2.0
+    image: ghcr.io/the-draupnir-project/draupnir:v3.1.0
     command: [ "bot", "--draupnir-config", "/etc/draupnir/production.yaml" ]
     restart: unless-stopped
     volumes:
diff --git a/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2 b/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2
deleted file mode 100644
index 9871eec2..00000000
--- a/resources/chaosknoten/matrix-sync/docker_compose/compose.yaml.j2
+++ /dev/null
@@ -1,25 +0,0 @@
----
-
-services:
-  sync:
-    image: git.hamburg.ccc.de/ccchh/matrix-member-sync:latest
-    command: ["uv", "run", "main.py", "sync"]
-    environment:
-      MATRIX_HOMESERVER_URL: https://matrix.hamburg.ccc.de
-      MATRIX_USER: ccchh-room-sync
-      MATRIX_ACCESS_TOKEN: {{ matrix_sync__matrix_access_token }}
-      KEYCLOAK_URL: https://id.hamburg.ccc.de
-      KEYCLOAK_REALM: ccchh
-      KEYCLOAK_CLIENT_ID: matrix-sync
-      KEYCLOAK_CLIENT_SECRET: {{ matrix_sync__keycloak_client_secret }}
-      ROOM_ATTRIBUTES: "!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I=matrix-chaos,!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs=matrix-intern"
-      MANUAL_MEMBER_LISTS: /configs
-      SYNC_INTERVAL: 123
-    restart: unless-stopped
-    volumes:
-      - ./configs:/configs
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "50m"
-        max-file: "3"
diff --git a/resources/chaosknoten/matrix-sync/docker_compose/config/!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs b/resources/chaosknoten/matrix-sync/docker_compose/config/!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs
deleted file mode 100644
index 374e493d..00000000
--- a/resources/chaosknoten/matrix-sync/docker_compose/config/!Q2weVNy3-f1NbrS4k9DlcWf6MdPxwL3ARLcuNsVFeVs
+++ /dev/null
@@ -1 +0,0 @@
-# Manual member lists for CCCHH @intern
diff --git a/resources/chaosknoten/matrix-sync/docker_compose/config/!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I b/resources/chaosknoten/matrix-sync/docker_compose/config/!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I
deleted file mode 100644
index 8ec2a998..00000000
--- a/resources/chaosknoten/matrix-sync/docker_compose/config/!oLGvjHkQvheeAUPNYmsnFABg5oPsRiu5j1wMjRx7d_I
+++ /dev/null
@@ -1 +0,0 @@
-# Manual member lists for CCCHH @chaos