diff --git a/ansible/inventory/molecule/host_vars/debian11-instance/matterbridge.toml.j2 b/ansible/inventory/molecule/host_vars/debian11-instance/matterbridge.toml.j2
index 98a2c63..762434d 100644
--- a/ansible/inventory/molecule/host_vars/debian11-instance/matterbridge.toml.j2
+++ b/ansible/inventory/molecule/host_vars/debian11-instance/matterbridge.toml.j2
@@ -2,6 +2,6 @@
 #####
 # Matterbridge configuration
 # WARNING: as this file contains credentials, be sure to set correct file permissions
-# https://github.com/42wim/matterbridge/wiki/How-to-create-your-config
-# https://github.com/42wim/matterbridge/wiki/Settings
+# https://github.com/matterbridge-org/matterbridge/blob/master/docs/config.md
+# https://github.com/matterbridge-org/matterbridge/blob/master/docs/settings.md
 #####
diff --git a/ansible/inventory/production/host_vars/johndoe.privacylx.org/matterbridge.toml.j2 b/ansible/inventory/production/host_vars/johndoe.privacylx.org/matterbridge.toml.j2
index 691e9de..ec16084 100644
--- a/ansible/inventory/production/host_vars/johndoe.privacylx.org/matterbridge.toml.j2
+++ b/ansible/inventory/production/host_vars/johndoe.privacylx.org/matterbridge.toml.j2
@@ -2,8 +2,8 @@
 #####
 # Matterbridge configuration
 # WARNING: as this file contains credentials, be sure to set correct file permissions
-# https://github.com/42wim/matterbridge/wiki/How-to-create-your-config
-# https://github.com/42wim/matterbridge/wiki/Settings
+# https://github.com/matterbridge-org/matterbridge/blob/master/docs/config.md
+# https://github.com/matterbridge-org/matterbridge/blob/master/docs/settings.md
 #####
 
 [matrix]
@@ -73,16 +73,6 @@
     RemoteNickFormat="[{PROTOCOL}] <{NICK}> "
     PrefixMessagesWithNick=true
 
-# This must always be [[gateway]], don't use anything else.
-[[gateway]]
-name="privacylx_gateway"
-enable=true
-inout = [
-    # IRC <-> Matrix bridge
-    { account="matrix.matrixorg", channel="#privacylx-internal:matrix.org" },
-    { account="irc.oftc", channel="#privacylx-internal", options={key="{{ matterbridge_oftc_key }}"}},
-]
-
 [[gateway]]
 name="privacylx_pub_gateway"
 enable=true
diff --git a/ansible/inventory/testing/host_vars/testing.privacylx.org/matterbridge.toml.j2 b/ansible/inventory/testing/host_vars/testing.privacylx.org/matterbridge.toml.j2
index f360fed..8676814 100644
--- a/ansible/inventory/testing/host_vars/testing.privacylx.org/matterbridge.toml.j2
+++ b/ansible/inventory/testing/host_vars/testing.privacylx.org/matterbridge.toml.j2
@@ -2,6 +2,6 @@
 #####
 # Matterbridge configuration
 # WARNING: as this file contains credentials, be sure to set correct file permissions
-# https://github.com/42wim/matterbridge/wiki/How-to-create-your-config
-# https://github.com/42wim/matterbridge/wiki/Settings
+# https://github.com/matterbridge-org/matterbridge/blob/master/docs/config.md
+# https://github.com/matterbridge-org/matterbridge/blob/master/docs/settings.md
 #####
diff --git a/ansible/roles/matterbridge/vars/main.yml b/ansible/roles/matterbridge/vars/main.yml
index f538e30..a8fb590 100644
--- a/ansible/roles/matterbridge/vars/main.yml
+++ b/ansible/roles/matterbridge/vars/main.yml
@@ -1,8 +1,8 @@
 ---
 
 matterbridge_path: /etc/matterbridge
-matterbridge_version: 1.26.0
-matterbridge_image: "42wim/matterbridge:{{ matterbridge_version }}"
+matterbridge_version: latest
+matterbridge_image: "ghcr.io/matterbridge-org/matterbridge:{{ matterbridge_version }}"
 matterbridge_name: privacylx-matterbridge
 # Set to true to enable debug logging
 matterbridge_debug: false