diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
index 8980f71ed4..be8fd45f71 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
@@ -181,8 +181,12 @@
       gap: var(--spacing-04);
 
       .badge-container {
-        display: flex;
-        gap: var(--spacing-04);
+        display: inline-block;
+        text-wrap: nowrap;
+
+        .badge:not(:first-child) {
+          margin-left: var(--spacing-04);
+        }
       }
 
       * {