diff --git a/webapp/public/js/domjudge.js b/webapp/public/js/domjudge.js
index 02239ff33f..0e9dde24ef 100644
--- a/webapp/public/js/domjudge.js
+++ b/webapp/public/js/domjudge.js
@@ -823,7 +823,7 @@ function setupPreviewClarification($input, $previewDiv, previewInitial) {
 }
 
 $(function () {
-    $('[data-toggle="tooltip"]').tooltip();
+    $('[data-bs-toggle="tooltip"]').tooltip();
 });
 
 function initializeKeyboardShortcuts() {
diff --git a/webapp/templates/jury/analysis/contest_overview.html.twig b/webapp/templates/jury/analysis/contest_overview.html.twig
index 3aeb6de59c..f153178a8f 100644
--- a/webapp/templates/jury/analysis/contest_overview.html.twig
+++ b/webapp/templates/jury/analysis/contest_overview.html.twig
@@ -24,6 +24,14 @@ table tr a {
     color: inherit;
 }
 </style>
+<script>
+$(function() {
+    $('[data-bs-toggle="popover"]').popover({
+      trigger: 'hover',
+      html: true
+    })
+})
+</script>
 {% endblock %}
 
 {% block content %}
@@ -36,7 +44,7 @@ table tr a {
           Contest Stats
         </div>
         <div class="card-body">
-          <abbr data-bs-toggle="popover" data-placement="bottom" data-bs-title="Misery Index" data-bs-content="
+          <abbr data-bs-toggle="popover" data-bs-placement="bottom" data-bs-title="Misery Index" data-bs-content="
             This is a measure of how 'bored' contestants are. It is the average number of
             people-minutes spent fruitlessly trying to solve problems at the end of the contest.
             <br>
diff --git a/webapp/templates/jury/entity_id_badge.html.twig b/webapp/templates/jury/entity_id_badge.html.twig
index 037714630a..8e304dc748 100644
--- a/webapp/templates/jury/entity_id_badge.html.twig
+++ b/webapp/templates/jury/entity_id_badge.html.twig
@@ -1,4 +1,4 @@
-<span class="badge text-bg-secondary id-badge" data-bs-toggle="tooltip" data-placement="top" title="{% if label is defined and label | length %}Label: {{ label }}, {% endif %}{% if externalId is not null %}External ID: {{ externalId }}, {% endif %}Internal ID: {{ idPrefix }}{{ id }}">
+<span class="badge text-bg-secondary id-badge" data-bs-toggle="tooltip" data-bs-placement="top" title="{% if label is defined and label | length %}Label: {{ label }}, {% endif %}{% if externalId is not null %}External ID: {{ externalId }}, {% endif %}Internal ID: {{ idPrefix }}{{ id }}">
     {% if label is defined and label | length %}
         {{ label }}
     {% elseif externalId is not null %}
diff --git a/webapp/templates/partials/problem_list.html.twig b/webapp/templates/partials/problem_list.html.twig
index 0733241ddd..bda100c09d 100644
--- a/webapp/templates/partials/problem_list.html.twig
+++ b/webapp/templates/partials/problem_list.html.twig
@@ -92,9 +92,9 @@
                                                             <div
                                                                 class="problem-stats-item {{ itemClass }}"
                                                                 data-bs-toggle="tooltip"
-                                                                data-placement="top"
-                                                                data-html="true"
-                                                                title="Between {{ stat.start.timestamp | printtime(null, contest) }} and {{ stat.end.timestamp | printtime(null, contest) }}:{{ '\n' }}{{ label }}">
+                                                                data-bs-placement="top"
+                                                                data-bs-html="true"
+                                                                title="Between {{ stat.start.timestamp | printtime(null, contest) }} and {{ stat.end.timestamp | printtime(null, contest) }}:<br/>{{ label }}">
                                                             </div>
                                                         {% endfor %}
                                                     </div>