diff --git a/config.yml b/config.yml
index 8ccd7b6..87ddd1d 100644
--- a/config.yml
+++ b/config.yml
@@ -5,6 +5,8 @@ services:
   - "webserver"
   - "peering"
   - "unix_users"
+  - "chatbridge"
+  - "mucbridge"
 webserver:
   vhosts:
     - host: "fr.tild3.org"
@@ -13,6 +15,84 @@ webserver:
 irc_announce:
   chan: "#fr"
 # TODO: reimplement peering with new recipes
+mucbridge:
+  chans:
+    # List of JIDs to bridge together, carefully following cheogram-muc-bridge settings
+    - [ { jid: "#joinjabber-fr%irc.tilde.chat@irc.localhost", tag: "~chat", nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"", nickLength: "Some 32" }, { jid: "fr@joinjabber.org", tag: "jabberFR", nickChars: "None Text", nickLength: "None Natural" } ]
+    # Mappings of server to channel name
+    - { tildechat: "#foo", jj: "foo" }
+  disroot:
+    - "anarchism"
+    - "federation"
+  jfr:
+    - "anarchisme"
+    - "fédération"
+  jjworkinggroups: # mappings defined in settings.profiles.jjworkinggroups
+    - "privacy"
+    - "bridging"
+    - "abuse"
+    - "translations"
+    - "sysadmin"
+    - "website"
+  settings:
+    host: "bridge.fr.tild3.org"
+    nick: "fr-bridge2"
+    gateway_irc: "irc.localhost" # Optional (defaults to irc.localhost + biboumi setup
+    accounts:
+      tildechat:
+        host: "irc.tilde.chat"
+        type: "irc" # Optional (default to "xmpp")
+        nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"" # Optional (default to that, when type="irc", "None Text" otherwise)
+        nickLength: 32 # Optional (default to 32)
+        tag: "~chat"
+      jj:
+        host: "joinjabber.org"
+        tag: "jj"
+      disroot:
+        host: "chat.disroot.org"
+        tag: "disroot"
+      jfr:
+        host: "chat.jabberfr.org"
+        tag: "jfr"
+    profiles:
+      jjworkinggroups:
+        tildechat: "#joinjabber-$room"
+        jj: "$room"
+      jfr:
+        tildechat: "#$room"
+        jfr: "$room"
+      disroot:
+        tildechat: "#$room"
+        disroot: "$room"
+#    - [ { jid: "#whereiseveryone%irc.libera.chat@irc.hmm.st", tag: "libera", nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"", nickLength: "Some 32" }, { jid: "guix@rooms.dismail.de", tag: "dismail", nickChars: "None Text", nickLength: "None Natural" } ]
+#chatbridge:
+#  jabberfr:
+#    - anarchisme
+#    - fédération
+#  disroot:
+#    - anarchism
+#    - federation
+#  settings:
+#    accounts:
+#      - name: "jabberfr"
+#        type: "xmpp"
+#        login: "matrixbot@jabber.fr"
+#        server: "chat.jabberfr.org"
+#      - name: "disroot"
+#        type: "xmpp"
+#        login: "matrixbot@jabber.fr"
+#        server: "chat.disroot.org"
+#      - name: "tildechat"
+#        type: "irc"
+#        login: "bridge"
+#        server: "irc.tilde.chat"
+#  profiles:
+#    jabberfr:
+#      tildechat: "#$room"
+#      jabberfr: "$room"
+#    disroot:
+#      tildechat: "#$room"
+#      disroot: "$room"
 peers:
   - name: tilde.netlib.re
     client_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHsVZvvVX3VPj2sWxrb8LJrn3650aoLAZgbY7+CB+NU"
diff --git a/roles b/roles
index 0c58e45..3ddabb0 160000
--- a/roles
+++ b/roles
@@ -1 +1 @@
-Subproject commit 0c58e456a5cfd97169b8907bebbb34c28db4333d
+Subproject commit 3ddabb084cd171ec78f71016278a01cead5d654a