diff --git a/dot/matterbridge.nix b/dot/matterbridge.nix
index a532294..3574a43 100644
--- a/dot/matterbridge.nix
+++ b/dot/matterbridge.nix
@@ -1,16 +1,15 @@
 { token }: ''
   [general]
-  RemoteNickFormat = "{NICK}"
+  RemoteNickFormat = "[{NOPINGNICK}] "
 
   [telegram]
     [telegram.kmein]
     Token = "${token}"
-    MessageFormat = "HTMLNick"
 
   [irc]
     [irc.freenode]
     Server = "irc.freenode.net:6667"
-    Nick = "kmein_bridge"
+    Nick = "tg_bridge"
 
   [[gateway]]
   name = "krebs-bridge"
diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix
index ff2930e..646d8d1 100644
--- a/systems/catullus/configuration.nix
+++ b/systems/catullus/configuration.nix
@@ -86,7 +86,7 @@ in {
     {
       services.matterbridge = {
         enable = true;
-        configPath = toString (pkgs.writeText "mattermost.toml" (import <dot/matterbridge.nix> {
+        configPath = toString (pkgs.writeText "matterbridge.toml" (import <dot/matterbridge.nix> {
           token = lib.strings.removeSuffix "\n" (builtins.readFile <secrets/telegram/kmein.token>);
         }));
       };