diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html
index af1ece0d..640f2691 100644
--- a/allianceauth/authentication/templates/authentication/dashboard.html
+++ b/allianceauth/authentication/templates/authentication/dashboard.html
@@ -7,7 +7,7 @@
     {% translate "Dashboard" %}
 {% endblock %}
 {% block content %}
-    <div class="d-flex justify-content-around align-self-center flex-wrap">
+    <div class="row">
         {% for dash in views %}
             {{ dash | safe }}
         {% endfor %}
diff --git a/allianceauth/authentication/templates/authentication/dashboard_characters.html b/allianceauth/authentication/templates/authentication/dashboard_characters.html
index 7021ba46..3560210f 100644
--- a/allianceauth/authentication/templates/authentication/dashboard_characters.html
+++ b/allianceauth/authentication/templates/authentication/dashboard_characters.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 align-self-stretch p-2 ps-0 pe-0 ps-xl-0 pe-xl-2">
+<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 mb-3">
     <div class="card h-100">
         <div class="card-body">
             {% translate "Characters" as widget_title %}
diff --git a/allianceauth/authentication/templates/authentication/dashboard_groups.html b/allianceauth/authentication/templates/authentication/dashboard_groups.html
index 270fcb76..d7d3c3b7 100644
--- a/allianceauth/authentication/templates/authentication/dashboard_groups.html
+++ b/allianceauth/authentication/templates/authentication/dashboard_groups.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 align-self-stretch py-2 ps-xl-2">
+<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 mb-3">
     <div class="card h-100">
         <div class="card-body">
             {% translate "Membership" as widget_title %}
diff --git a/allianceauth/framework/templates/framework/dashboard/widget-title.html b/allianceauth/framework/templates/framework/dashboard/widget-title.html
index fdc11845..f6c0c855 100644
--- a/allianceauth/framework/templates/framework/dashboard/widget-title.html
+++ b/allianceauth/framework/templates/framework/dashboard/widget-title.html
@@ -1,7 +1,7 @@
 {#Usage:#}
 {#    {% include "framework/dashboard/widget-title.html" with title="Foobar" %}#}
 
-<div class="d-flex align-items-center">
+<div class="text-center">
     <h4 class="ms-auto me-auto mb-3">
         {{ title }}
     </h4>
diff --git a/allianceauth/optimer/templates/optimer/dashboard.ops.html b/allianceauth/optimer/templates/optimer/dashboard.ops.html
index cf990ec4..b9e1d418 100644
--- a/allianceauth/optimer/templates/optimer/dashboard.ops.html
+++ b/allianceauth/optimer/templates/optimer/dashboard.ops.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load evelinks %}
 
-<div class="col-12 align-self-stretch py-2">
+<div class="col-12 mb-3">
     <div class="card h-100">
         <div class="card-body">
             {% translate "Upcoming Fleets" as widget_title %}
diff --git a/allianceauth/templates/allianceauth/admin-status/esi_check.html b/allianceauth/templates/allianceauth/admin-status/esi_check.html
index 3b8393b9..9c7f1605 100644
--- a/allianceauth/templates/allianceauth/admin-status/esi_check.html
+++ b/allianceauth/templates/allianceauth/admin-status/esi_check.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div id="esi-alert" class="col-12 align-self-stretch py-2 collapse">
+<div id="esi-alert" class="col-12 collapse">
     <div class="alert alert-warning">
         <p class="text-center ">{% translate 'Your Server received an ESI error response code of ' %}<b id="esi-code">?</b></p>
         <hr>
@@ -23,7 +23,7 @@
             console.log("ESI Check: ", JSON.stringify(responseJson, null, 2));
 
             const status = responseJson.status;
-            if (status != 200) {
+            if (status !== 200) {
                 elemCode.textContent = status
                 elemMessage.textContent = responseJson.data.error;
                 new bootstrap.Collapse(elemCard, {
diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index 23e4c026..a8de1aca 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -2,7 +2,7 @@
 {% load humanize %}
 
 {% if notifications %}
-    <div id="aa-dashboard-panel-admin-notifications" class="col-12 align-self-stretch pb-2">
+    <div id="aa-dashboard-panel-admin-notifications" class="col-12 mb-3">
         <div class="card">
             <div class="card-body">
                 {% translate "Alliance Auth Notifications" as widget_title %}
@@ -46,7 +46,7 @@
     </div>
 {% endif %}
 
-<div class="col-12 align-self-stretch py-2">
+<div class="col-12 mb-3">
     <div class="card">
         <div class="card-body row">
             <div id="aa-dashboard-panel-software-version" class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
diff --git a/allianceauth/timerboard/templates/timerboard/dashboard.timers.html b/allianceauth/timerboard/templates/timerboard/dashboard.timers.html
index d512e483..4b6d9a5a 100644
--- a/allianceauth/timerboard/templates/timerboard/dashboard.timers.html
+++ b/allianceauth/timerboard/templates/timerboard/dashboard.timers.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load evelinks %}
 
-<div class="col-12 align-self-stretch py-2">
+<div class="col-12 mb-3">
     <div class="card h-100">
         <div class="card-body">
             {% translate "Upcoming Timers" as widget_title %}
diff --git a/docs/development/custom/framework/templates.md b/docs/development/custom/framework/templates.md
index b7581a8c..c989e53e 100644
--- a/docs/development/custom/framework/templates.md
+++ b/docs/development/custom/framework/templates.md
@@ -35,7 +35,7 @@ To ensure the dashboard widgets have a unified style, we provide a template part
 To use it, you can use the following code in your dashboard widget template:
 
 ```django
-<div id="my-app-dashboard-widget" class="col-12 align-self-stretch py-2">
+<div id="my-app-dashboard-widget" class="col-12 mb-3">
     <div class="card">
         <div class="card-body">
             {% translate "My Widget Title" as widget_title %}