diff --git a/k8s/matrix/config-janky.solutions/homeserver.yaml b/k8s/matrix/config-janky.solutions/homeserver.yaml
index 2b553f2..164554d 100644
--- a/k8s/matrix/config-janky.solutions/homeserver.yaml
+++ b/k8s/matrix/config-janky.solutions/homeserver.yaml
@@ -24,6 +24,9 @@ form_secret: "SECRET_form_secret"
 signing_key_path: "/secrets/janky.solutions.signing.key"
 trusted_key_servers:
   - server_name: "matrix.org"
+auto_join_rooms:
+  - "#jankysolutions:janky.solutions"
+  - "#general:janky.solutions"
 public_baseurl: https://matrix.janky.solutions
 ip_range_whitelist: [10.5.1.245,10.5.1.1]
 # oidc_providers: