diff --git a/roles/custom/matrix-jitsi/defaults/main.yml b/roles/custom/matrix-jitsi/defaults/main.yml
index e61796bfe..a3bbce5f0 100644
--- a/roles/custom/matrix-jitsi/defaults/main.yml
+++ b/roles/custom/matrix-jitsi/defaults/main.yml
@@ -205,8 +205,8 @@ matrix_jitsi_jicofo_component_secret: ''
 matrix_jitsi_jicofo_auth_user: focus
 matrix_jitsi_jicofo_auth_password: ''
 
-# Enable Sentry DSN
-matrix_jitsi_jicofo_sentry_dns: ''
+# Enable Sentry DSN (default false)
+matrix_jitsi_jicofo_sentry_dns_enabled: 0
 
 matrix_jitsi_jvb_docker_image: "{{ matrix_container_global_registry_prefix }}jitsi/jvb:{{ matrix_jitsi_container_image_tag }}"
 matrix_jitsi_jvb_docker_image_force_pull: "{{ matrix_jitsi_jvb_docker_image.endswith(':latest') }}"
@@ -223,8 +223,8 @@ matrix_jitsi_jvb_systemd_required_services_list: ['docker.service', 'matrix-jits
 matrix_jitsi_jvb_auth_user: jvb
 matrix_jitsi_jvb_auth_password: ''
 
-# Enable Sentry DSN
-matrix_jitsi_jvb_sentry_dns: ''
+# Enable Sentry DSN (default false)
+matrix_jitsi_jvb_sentry_dns_enabled: 0
 
 # STUN servers used by JVB on the server-side, so it can discover its own external IP address.
 # Pointing this to a STUN server running on the same Docker network may lead to incorrect IP address discovery.
diff --git a/roles/custom/matrix-jitsi/templates/jicofo/env.j2 b/roles/custom/matrix-jitsi/templates/jicofo/env.j2
index c96c5d18b..0d250a3d9 100644
--- a/roles/custom/matrix-jitsi/templates/jicofo/env.j2
+++ b/roles/custom/matrix-jitsi/templates/jicofo/env.j2
@@ -27,7 +27,7 @@ JIGASI_SIP_URI
 JVB_BREWERY_MUC={{ matrix_jitsi_jvb_brewery_muc }}
 MAX_BRIDGE_PARTICIPANTS
 OCTO_BRIDGE_SELECTION_STRATEGY
-SENTRY_DSN={{1 if matrix_jitsi_jicofo_sentry_dns else 0}}
+SENTRY_DSN={{ matrix_jitsi_jicofo_sentry_dns_enabled }}
 SENTRY_ENVIRONMENT
 SENTRY_RELEASE
 TZ={{ matrix_jitsi_timezone }}
diff --git a/roles/custom/matrix-jitsi/templates/jvb/env.j2 b/roles/custom/matrix-jitsi/templates/jvb/env.j2
index 0652e567d..7daacf250 100644
--- a/roles/custom/matrix-jitsi/templates/jvb/env.j2
+++ b/roles/custom/matrix-jitsi/templates/jvb/env.j2
@@ -18,7 +18,7 @@ JVB_OCTO_REGION
 JVB_WS_DOMAIN
 JVB_WS_SERVER_ID
 PUBLIC_URL={{ matrix_jitsi_web_public_url }}
-SENTRY_DSN={{1 if matrix_jitsi_jvb_sentry_dns else 0}}
+SENTRY_DSN={{ matrix_jitsi_jvb_sentry_dns_enabled }}
 SENTRY_ENVIRONMENT
 SENTRY_RELEASE
 COLIBRI_REST_ENABLED