diff --git a/.env.waha.enc b/.env.waha.enc
new file mode 100644
index 0000000..8da9281
--- /dev/null
+++ b/.env.waha.enc
@@ -0,0 +1,14 @@
+{
+	"data": "ENC[AES256_GCM,data:bkJxYLOPEicp0lJICtqDp/9ccFOeVw/YrqQipSq0lvWeKoWf5nHbgmpGgRS50QEQfKI/G1habqNzZ26FMO2D6uWp6iLZo/klrHyCOMG8zWrbK/8QPeVSnUHkdS0+D5qrxXnILomCpwwQz3NlpAbrce5Jv77T2IgmXAS0oSp1J1YEThaDJPYeL71t72bGtcBddALTASC4n0kkswa00AJpd/+yAKy081PnyxjfoJvL63JzNEf2SKIzPBZIKhCq2EH7+tF+Zb/BH2BnHEFt65BgWOkAlqTSux0bpNATWSDv1wjQwE5t23ULZfDGjUzS1Z6taBknNg9UlzREyxmNhyme3/j71zR374e12Tsx7aGcyP90S3VZDOVvisT+cCvSrEUYE6j86kIxqU+vwt0KmbSwTc632D65zRdluGf6EEeO7fczWhMZes5FwaX6rqnGVcTxr3IbyZVy1MDQX4L+Lt9W3Y8qT9Om5DSCNtJLt+4=,iv:Hp1jRP2Yf69xjRaIBo+XddmvbXefMTKhFsWpL3heJVQ=,tag:veunmjZZAT6r5DmTg7N0dQ==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"recipient": "age1z8gak2l4h0vpcnhtcdxmem2u9h2n54vuksk8ys82609qtzampuvqh50wdr",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkWGdxWExSN214SmpKTXBw\nV09pbnlUVndsL3RScWU2Ui9RRDRFR2FkcEZvCmNnRjVaLytBWjg3SGt5NUNudnpU\nL0ZjQlpQb2JWUjNkdUttWUJHZEY5VDQKLS0tIHlaekt3dUJsRFZ5WVpTRFcyNTBs\nT3BCalpPRU02bDQ3dndnUi9SVmhqc0UKNGVYduRt3VFPO40j1+9J1Cw5Z/oqa2O3\nDdLjiQY4HN8em7EbQF7JKNFD1LXUKiv/R+91zQoiGS9xKmxIIzGXug==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2026-04-04T07:42:54Z",
+		"mac": "ENC[AES256_GCM,data:odjxKb5sszracS5ZiWXCn75B56+ozAq2HFCVlPaDU4ACpzibZLKT0wzKqfH5ES4vD28Y7DeLtEBLLPoO8jaE8UoebAVDwFWmVUGfPIjcWLeKFZidyifupQp28ARXekoK5lsBlTYWxdXvJu7oOeu2zi0e+H26y9i2I5FZL3GoTm0=,iv:gdKPjkNH4R/bbbcpI+MVB9vp2n+olJ9+daEt7JxS4SA=,tag:V9upeQr6loR914YVPhA3jw==,type:str]",
+		"version": "3.12.2"
+	}
+}
diff --git a/compose.yaml b/compose.yaml
index f7bc57d..ecc650b 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,4 +1,3 @@
----
 services:
   synapse:
     image: matrixdotorg/synapse:latest
@@ -31,7 +30,7 @@ services:
     restart: unless-stopped
     network_mode: host
     volumes:
-     - /app-config/matrix/coturn/turnserver.conf:/etc/coturn/turnserver.conf:ro
+      - /app-config/matrix/coturn/turnserver.conf:/etc/coturn/turnserver.conf:ro
 
   synapse-admin:
     image: awesometechnologies/synapse-admin:latest
@@ -39,7 +38,7 @@ services:
     restart: unless-stopped
     ports:
       - "8081:80"
-      
+
   livekit:
     image: livekit/livekit-server:latest
     container_name: livekit
@@ -47,7 +46,19 @@ services:
     ports:
       - "7880:7880"
       - "7881:7881"
-      - "50000-60000:50000-60000/udp"
-    command: --config /etc/livekit/config.yaml
+      - "50100-50200:50100-50200/udp"
     volumes:
-      - /app-config/matrix/livekit/config.yaml:/etc/livekit/config.yaml
+      - /app-config/matrix/livekit/config.yaml:/etc/livekit/config.yaml:ro
+    command: --config /etc/livekit/config.yaml
+
+  livekit-jwt:
+    image: ghcr.io/element-hq/lk-jwt-service:latest
+    container_name: livekit-jwt
+    restart: unless-stopped
+    environment:
+      - LIVEKIT_URL=wss://livekit.plappern.com
+      - LIVEKIT_KEY=plappern_lk_key
+      - LIVEKIT_SECRET=plappern_lk_secret_7f8a9b2c3d4e5f6a
+      - LIVEKIT_JWT_BIND=:8080
+    ports:
+      - "8090:8080"