diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/badge.scss b/services/web/frontend/stylesheets/bootstrap-5/components/badge.scss
index 73e13d61f5..bcc94f62d1 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/badge.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/badge.scss
@@ -117,16 +117,10 @@ $max-width: 160px;
   }
 }
 
-.tags {
-  .tags-list {
-    list-style: none;
-    padding: 0;
-    display: flex;
-    gap: var(--spacing-05);
-    flex-wrap: wrap;
-  }
-
-  li {
-    display: inline-flex;
-  }
+.badge-link-list {
+  display: flex;
+  gap: var(--spacing-05);
+  flex-wrap: wrap;
+  list-style: none;
+  padding: 0;
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/gallery-search.scss b/services/web/frontend/stylesheets/bootstrap-5/components/gallery-search.scss
index 77a31dad58..3e10a6b6fe 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/gallery-search.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/gallery-search.scss
@@ -111,7 +111,7 @@
       .search-author {
         display: block;
 
-        & + .search-hit-tags {
+        & + .badge-link-list {
           margin-top: var(--spacing-06);
         }
       }
@@ -120,15 +120,6 @@
         margin-left: var(--spacing-06);
         vertical-align: text-top;
       }
-
-      .search-hit-tags {
-        list-style: none;
-        margin: 0;
-        padding-left: 0;
-        display: flex;
-        flex-wrap: wrap;
-        gap: var(--spacing-04);
-      }
     }
   }
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/cms.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/cms.scss
index 5293acdad4..3fd3041964 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/cms.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/cms.scss
@@ -509,7 +509,7 @@
       margin-bottom: unset;
     }
 
-    .tags-list {
+    .badge-link-list {
       padding: 0 var(--spacing-05);
       margin-bottom: 0 !important;
     }
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 01f5431ea5..6883c4f001 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
@@ -340,11 +340,6 @@
     @include heading-xs;
   }
 
-  .section-tags {
-    display: flex;
-    gap: var(--spacing-04);
-  }
-
   .cta-links {
     margin: var(--spacing-09) 0;
 
@@ -409,12 +404,14 @@
   }
 
   @include media-breakpoint-down(md) {
+    .template-item-left-section {
+      .badge-link-list {
+        margin-top: var(--spacing-04);
+      }
+    }
+
     .template-item-right-section {
       margin-top: var(--spacing-11);
     }
-
-    .section-tags {
-      margin-top: var(--spacing-04);
-    }
   }
 }