diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py
index 0813deb36..ecd25f9ee 100644
--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -322,7 +322,7 @@ class ChoiceFieldColumn(tables.Column):
         except AttributeError:
             bg_color = self.DEFAULT_BG_COLOR
 
-        return mark_safe(f'<span class="badge bg-{bg_color}">{value}</span>')
+        return mark_safe(f'<span class="badge text-bg-{bg_color}">{value}</span>')
 
     def value(self, value):
         return value
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 435fb4f0b..61dae9873 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -54,7 +54,7 @@
                                 {% elif object.rack and object.position %}
                                     <span>U{{ object.position|floatformat }} / {{ object.get_face_display }}</span>
                                 {% elif object.rack and object.device_type.u_height %}
-                                    <span class="badge bg-warning">{% trans "Not racked" %}</span>
+                                    <span class="badge text-bg-warning">{% trans "Not racked" %}</span>
                                 {% else %}
                                     {{ ''|placeholder }}
                                 {% endif %}
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index 0387f5206..88139c22a 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -93,9 +93,9 @@
                             <th scope="row">{% trans "Connection Status" %}</th>
                             <td>
                                 {% if object.cable.status %}
-                                    <span class="badge bg-success">{{ object.cable.get_status_display }}</span>
+                                    <span class="badge text-bg-success">{{ object.cable.get_status_display }}</span>
                                 {% else %}
-                                    <span class="badge bg-info">{{ object.cable.get_status_display }}</span>
+                                    <span class="badge text-bg-info">{{ object.cable.get_status_display }}</span>
                                 {% endif %}
                             </td>
                         </tr>
diff --git a/netbox/templates/dcim/inc/connection_endpoints.html b/netbox/templates/dcim/inc/connection_endpoints.html
index 79d2cf5d1..4538b9f52 100644
--- a/netbox/templates/dcim/inc/connection_endpoints.html
+++ b/netbox/templates/dcim/inc/connection_endpoints.html
@@ -13,9 +13,9 @@
     <th scope="row">{% trans "Path Status" %}</th>
     <td>
       {% if object.path.is_complete and object.path.is_active %}
-        <span class="badge bg-success">{% trans "Reachable" %}</span>
+        <span class="badge text-bg-success">{% trans "Reachable" %}</span>
       {% else %}
-        <span class="badge bg-danger">{% trans "Not Reachable" %}</span>
+        <span class="badge text-bg-danger">{% trans "Not Reachable" %}</span>
       {% endif %}
     </td>
   </tr>
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index 5b4a7a7aa..e99eaa3a8 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -89,9 +89,9 @@
                             <th scope="row">{% trans "Connection Status" %}</th>
                             <td>
                                 {% if object.cable.status %}
-                                    <span class="badge bg-success">{{ object.cable.get_status_display }}</span>
+                                    <span class="badge text-bg-success">{{ object.cable.get_status_display }}</span>
                                 {% else %}
-                                    <span class="badge bg-info">{{ object.cable.get_status_display }}</span>
+                                    <span class="badge text-bg-info">{{ object.cable.get_status_display }}</span>
                                 {% endif %}
                             </td>
                         </tr>
diff --git a/netbox/templates/dcim/trace/cable.html b/netbox/templates/dcim/trace/cable.html
index 88d2d6b28..a89e2cff7 100644
--- a/netbox/templates/dcim/trace/cable.html
+++ b/netbox/templates/dcim/trace/cable.html
@@ -8,7 +8,7 @@
         </a>
     </strong><br />
     {% if cable.type %}
-        <span class="badge bg-secondary">{{ cable.get_type_display|default:"" }}</span>
+        <span class="badge text-bg-secondary">{{ cable.get_type_display|default:"" }}</span>
     {% endif %}
     {% if cable.length %}
         ({{ cable.length|floatformat }} {{ cable.get_length_unit_display }})<br />
diff --git a/netbox/templates/extras/customfield.html b/netbox/templates/extras/customfield.html
index 95919b414..35b356ae6 100644
--- a/netbox/templates/extras/customfield.html
+++ b/netbox/templates/extras/customfield.html
@@ -137,9 +137,9 @@
             {{ qs.model|meta:"verbose_name_plural"|bettertitle }}
             {% with count=qs.count %}
               {% if count %}
-                <span class="badge bg-primary rounded-pill">{{ count }}</span>
+                <span class="badge text-bg-primary rounded-pill">{{ count }}</span>
               {% else %}
-                <span class="badge bg-light rounded-pill">&mdash;</span>
+                <span class="badge text-bg-light rounded-pill">&mdash;</span>
               {% endif %}
             {% endwith %}
           </a>
diff --git a/netbox/templates/extras/htmx/report_result.html b/netbox/templates/extras/htmx/report_result.html
index e6b6caf73..09592308d 100644
--- a/netbox/templates/extras/htmx/report_result.html
+++ b/netbox/templates/extras/htmx/report_result.html
@@ -24,10 +24,10 @@
           <tr>
             <td class="font-monospace"><a href="#{{ method }}">{{ method }}</a></td>
             <td class="text-end report-stats">
-              <span class="badge bg-success">{{ data.success }}</span>
-              <span class="badge bg-info">{{ data.info }}</span>
-              <span class="badge bg-warning">{{ data.warning }}</span>
-              <span class="badge bg-danger">{{ data.failure }}</span>
+              <span class="badge text-bg-success">{{ data.success }}</span>
+              <span class="badge text-bg-info">{{ data.info }}</span>
+              <span class="badge text-bg-warning">{{ data.warning }}</span>
+              <span class="badge text-bg-danger">{{ data.failure }}</span>
             </td>
           </tr>
         {% endfor %}
@@ -57,7 +57,7 @@
               <tr class="{% if level == 'failure' %}danger{% elif level %}{{ level }}{% endif %}">
                 <td>{{ time }}</td>
                 <td>
-                  <label class="badge bg-{% if level == 'failure' %}danger{% else %}{{ level }}{% endif %}">{{ level|title }}</label>
+                  <label class="badge text-bg-{% if level == 'failure' %}danger{% else %}{{ level }}{% endif %}">{{ level|title }}</label>
                 </td>
                 <td>
                   {% if obj and url %}
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index 0a38ea75c..d8a4b7d2d 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -72,7 +72,7 @@
                             {% if report.is_valid %}
                               {{ ''|placeholder }}
                             {% else %}
-                              <span class="badge bg-danger" title="{% trans "Report has no test methods" %}">
+                              <span class="badge text-bg-danger" title="{% trans "Report has no test methods" %}">
                                 {% trans "Invalid" %}
                               </span>
                             {% endif %}
@@ -101,10 +101,10 @@
                             <span class="ps-3">{{ method }}</span>
                           </td>
                           <td class="text-end text-nowrap report-stats">
-                            <span class="badge bg-success">{{ stats.success }}</span>
-                            <span class="badge bg-info">{{ stats.info }}</span>
-                            <span class="badge bg-warning">{{ stats.warning }}</span>
-                            <span class="badge bg-danger">{{ stats.failure }}</span>
+                            <span class="badge text-bg-success">{{ stats.success }}</span>
+                            <span class="badge text-bg-info">{{ stats.info }}</span>
+                            <span class="badge text-bg-warning">{{ stats.warning }}</span>
+                            <span class="badge text-bg-danger">{{ stats.failure }}</span>
                           </td>
                         </tr>
                       {% endfor %}
diff --git a/netbox/templates/extras/templatetags/log_level.html b/netbox/templates/extras/templatetags/log_level.html
index 5fa66dcd3..ea38139f0 100644
--- a/netbox/templates/extras/templatetags/log_level.html
+++ b/netbox/templates/extras/templatetags/log_level.html
@@ -1 +1 @@
-<label class="badge bg-{{ class }}">{{ name }}</label>
\ No newline at end of file
+<label class="badge text-bg-{{ class }}">{{ name }}</label>
\ No newline at end of file
diff --git a/netbox/templates/inc/panels/related_objects.html b/netbox/templates/inc/panels/related_objects.html
index e83072810..57605f110 100644
--- a/netbox/templates/inc/panels/related_objects.html
+++ b/netbox/templates/inc/panels/related_objects.html
@@ -10,9 +10,9 @@
           {{ qs.model|meta:"verbose_name_plural"|bettertitle }}
           {% with count=qs.count %}
             {% if count %}
-              <span class="badge bg-primary rounded-pill">{{ count }}</span>
+              <span class="badge text-bg-primary rounded-pill">{{ count }}</span>
             {% else %}
-              <span class="badge bg-light rounded-pill">&mdash;</span>
+              <span class="badge text-bg-light rounded-pill">&mdash;</span>
             {% endif %}
           {% endwith %}
         </a>
diff --git a/netbox/utilities/templates/helpers/applied_filters.html b/netbox/utilities/templates/helpers/applied_filters.html
index 2a8ebc706..6e2b10e11 100644
--- a/netbox/utilities/templates/helpers/applied_filters.html
+++ b/netbox/utilities/templates/helpers/applied_filters.html
@@ -2,17 +2,17 @@
 {% if applied_filters %}
   <div class="mb-3">
     {% for filter in applied_filters %}
-      <a href="{{ filter.link_url }}" class="badge rounded-pill bg-primary text-decoration-none me-1">
+      <a href="{{ filter.link_url }}" class="badge rounded-pill text-bg-primary text-decoration-none me-1">
         <i class="mdi mdi-close"></i> {{ filter.link_text }}
       </a>
     {% endfor %}
     {% if applied_filters|length > 1 %}
-      <a href="?" class="badge rounded-pill bg-danger text-decoration-none me-1">
+      <a href="?" class="badge rounded-pill text-bg-danger text-decoration-none me-1">
         <i class="mdi mdi-tag-off"></i> {% trans "Clear all" %}
       </a>
     {% endif %}
     {% if save_link %}
-      <a href="{{ save_link }}" class="badge rounded-pill bg-success text-decoration-none me-1">
+      <a href="{{ save_link }}" class="badge rounded-pill text-bg-success text-decoration-none me-1">
         <i class="mdi mdi-content-save"></i> {% trans "Save" %}
       </a>
     {% endif %}
diff --git a/netbox/utilities/templates/widgets/markdown_input.html b/netbox/utilities/templates/widgets/markdown_input.html
index 1bdb55970..f6f4ff1ff 100644
--- a/netbox/utilities/templates/widgets/markdown_input.html
+++ b/netbox/utilities/templates/widgets/markdown_input.html
@@ -12,7 +12,7 @@
             </button>
           </li>
       </ul>
-      <div class="tab-content bg-body rounded-bottom border-top">
+      <div class="tab-content text-bg-body rounded-bottom border-top">
         <div class="tab-pane show active" id="{{ widget.name }}-input" role="tabpanel" aria-labelledby="{{ widget.name }}-input-tab">
         {% include "django/forms/widgets/textarea.html" %}
         </div>