diff --git a/roles/matrix-bridge-mautrix-signal/defaults/main.yml b/roles/matrix-bridge-mautrix-signal/defaults/main.yml
index 93993fa11..b4ecad133 100644
--- a/roles/matrix-bridge-mautrix-signal/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-signal/defaults/main.yml
@@ -78,6 +78,9 @@ matrix_mautrix_signal_appservice_database: "{{
 # Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth).
 matrix_mautrix_signal_login_shared_secret: ''
 
+# Allow using double puppeting from any server with a valid client .well-known file.
+matrix_mautrix_signal_double_puppet_allow_discovery: false
+
 # Enable bridge relay bot functionality
 matrix_mautrix_signal_relaybot_enabled: false
 
diff --git a/roles/matrix-bridge-mautrix-signal/templates/config.yaml.j2 b/roles/matrix-bridge-mautrix-signal/templates/config.yaml.j2
index 19c3ba053..89ddd75f9 100644
--- a/roles/matrix-bridge-mautrix-signal/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-signal/templates/config.yaml.j2
@@ -124,7 +124,7 @@ bridge:
     # and is therefore prone to race conditions.
     sync_direct_chat_list: false
     # Allow using double puppeting from any server with a valid client .well-known file.
-    double_puppet_allow_discovery: false
+    double_puppet_allow_discovery: {{ matrix_mautrix_signal_double_puppet_allow_discovery }}
     # Servers to allow double puppeting from, even if double_puppet_allow_discovery is false.
     double_puppet_server_map: {}
     # Shared secret for https://github.com/devture/matrix-synapse-shared-secret-auth