diff --git a/admin/roles/classes/define_role_table_advanced.php b/admin/roles/classes/define_role_table_advanced.php
index 632cb3e39a6..402e7e514fa 100644
--- a/admin/roles/classes/define_role_table_advanced.php
+++ b/admin/roles/classes/define_role_table_advanced.php
@@ -655,7 +655,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             echo "</label>\n";
         }
         if ($helpicon) {
-            echo '<span class="float-sm-right text-nowrap">'.$helpicon.'</span>';
+            echo '<span class="float-sm-end text-nowrap">'.$helpicon.'</span>';
         }
         echo '</div>';
         if (isset($this->errors[$name])) {
diff --git a/admin/tool/admin_presets/templates/export_import.mustache b/admin/tool/admin_presets/templates/export_import.mustache
index 78b773fb8cf..8a66b1e00a7 100644
--- a/admin/tool/admin_presets/templates/export_import.mustache
+++ b/admin/tool/admin_presets/templates/export_import.mustache
@@ -40,7 +40,7 @@
     }
 }}
 
-<div class="mt-2 mb-1 float-right">
+<div class="mt-2 mb-1 float-end">
     {{#export}}{{> core/single_button}}{{/export}}
     {{#import}}{{> core/single_button}}{{/import}}
 </div>
diff --git a/admin/tool/componentlibrary/content/bootstrap/components/forms.md b/admin/tool/componentlibrary/content/bootstrap/components/forms.md
index e17e47fc578..40d1d47d2a4 100644
--- a/admin/tool/componentlibrary/content/bootstrap/components/forms.md
+++ b/admin/tool/componentlibrary/content/bootstrap/components/forms.md
@@ -383,7 +383,7 @@ At times, you maybe need to use margin or padding utilities to create that perfe
     </div>
   </div>
   <fieldset class="form-group row">
-    <legend class="col-form-label col-sm-2 float-sm-left pt-0">Radios</legend>
+    <legend class="col-form-label col-sm-2 float-sm-start pt-0">Radios</legend>
     <div class="col-sm-10">
       <div class="form-check">
         <input class="form-check-input" type="radio" name="gridRadios" id="gridRadios1" value="option1" checked>
diff --git a/admin/tool/componentlibrary/content/bootstrap/components/spinners.md b/admin/tool/componentlibrary/content/bootstrap/components/spinners.md
index 1140477e077..34d4d37ac34 100644
--- a/admin/tool/componentlibrary/content/bootstrap/components/spinners.md
+++ b/admin/tool/componentlibrary/content/bootstrap/components/spinners.md
@@ -105,7 +105,7 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex
 
 {{< example >}}
 <div class="clearfix">
-  <div class="spinner-border float-right" role="status">
+  <div class="spinner-border float-end" role="status">
     <span class="sr-only">Loading...</span>
   </div>
 </div>
diff --git a/admin/tool/componentlibrary/content/bootstrap/content/images.md b/admin/tool/componentlibrary/content/bootstrap/content/images.md
index 0a25b13449e..f5af9d08c38 100644
--- a/admin/tool/componentlibrary/content/bootstrap/content/images.md
+++ b/admin/tool/componentlibrary/content/bootstrap/content/images.md
@@ -33,8 +33,8 @@ In addition to our [border-radius utilities]({{< docsref "/utilities/borders" >}
 Align images with the [helper float classes]({{< docsref "/utilities/float" >}}) or [text alignment classes]({{< docsref "/utilities/text#text-alignment" >}}). `block`-level images can be centered using [the `.mx-auto` margin utility class]({{< docsref "/utilities/spacing#horizontal-centering" >}}).
 
 {{< example >}}
-{{< placeholder width="200" height="200" class="rounded float-left" >}}
-{{< placeholder width="200" height="200" class="rounded float-right" >}}
+{{< placeholder width="200" height="200" class="rounded float-start" >}}
+{{< placeholder width="200" height="200" class="rounded float-end" >}}
 {{< /example >}}
 
 {{< example >}}
diff --git a/admin/tool/componentlibrary/content/bootstrap/utilities/clearfix.md b/admin/tool/componentlibrary/content/bootstrap/utilities/clearfix.md
index c2f129a7150..2d2f7a22a1b 100644
--- a/admin/tool/componentlibrary/content/bootstrap/utilities/clearfix.md
+++ b/admin/tool/componentlibrary/content/bootstrap/utilities/clearfix.md
@@ -31,7 +31,7 @@ The following example shows how the clearfix can be used. Without the clearfix t
 
 {{< example >}}
 <div class="bg-info clearfix">
-  <button type="button" class="btn btn-secondary float-left">Example Button floated left</button>
-  <button type="button" class="btn btn-secondary float-right">Example Button floated right</button>
+  <button type="button" class="btn btn-secondary float-start">Example Button floated left</button>
+  <button type="button" class="btn btn-secondary float-end">Example Button floated right</button>
 </div>
 {{< /example >}}
diff --git a/admin/tool/componentlibrary/content/bootstrap/utilities/float.md b/admin/tool/componentlibrary/content/bootstrap/utilities/float.md
index be35d729d12..1f6cdab4a1e 100644
--- a/admin/tool/componentlibrary/content/bootstrap/utilities/float.md
+++ b/admin/tool/componentlibrary/content/bootstrap/utilities/float.md
@@ -15,8 +15,8 @@ These utility classes float an element to the left or right, or disable floating
 Toggle a float with a class:
 
 {{< example >}}
-<div class="float-left">Float left on all viewport sizes</div><br>
-<div class="float-right">Float right on all viewport sizes</div><br>
+<div class="float-start">Float left on all viewport sizes</div><br>
+<div class="float-end">Float right on all viewport sizes</div><br>
 <div class="float-none">Don't float on all viewport sizes</div>
 {{< /example >}}
 
@@ -41,10 +41,10 @@ Or by Sass mixin:
 Responsive variations also exist for each `float` value.
 
 {{< example >}}
-<div class="float-sm-left">Float left on viewports sized SM (small) or wider</div><br>
-<div class="float-md-left">Float left on viewports sized MD (medium) or wider</div><br>
-<div class="float-lg-left">Float left on viewports sized LG (large) or wider</div><br>
-<div class="float-xl-left">Float left on viewports sized XL (extra-large) or wider</div><br>
+<div class="float-sm-start">Float left on viewports sized SM (small) or wider</div><br>
+<div class="float-md-start">Float left on viewports sized MD (medium) or wider</div><br>
+<div class="float-lg-start">Float left on viewports sized LG (large) or wider</div><br>
+<div class="float-xl-start">Float left on viewports sized XL (extra-large) or wider</div><br>
 {{< /example >}}
 
 Here are all the support classes;
diff --git a/admin/tool/dataprivacy/templates/data_deletion.mustache b/admin/tool/dataprivacy/templates/data_deletion.mustache
index 7f2e346ce26..137e00a2b70 100644
--- a/admin/tool/dataprivacy/templates/data_deletion.mustache
+++ b/admin/tool/dataprivacy/templates/data_deletion.mustache
@@ -58,13 +58,13 @@
         <div class="alert alert-info">
             {{#str}}datadeletionpagehelp, tool_dataprivacy{{/str}}
         </div>
-        <div class="float-left">
+        <div class="float-start">
             {{#filter}}
                 {{> core/single_select}}
             {{/filter}}
         </div>
         {{#existingcontexts}}
-            <div class="float-right">
+            <div class="float-end">
                 <button data-action="markfordeletion" class="btn btn-secondary">{{#str}}deleteselected, moodle{{/str}}</button>
             </div>
         {{/existingcontexts}}
@@ -74,7 +74,7 @@
     </div>
     <div class="row" data-region="bottom-nav">
         {{#existingcontexts}}
-            <div class="float-right">
+            <div class="float-end">
                 <button data-action="markfordeletion" class="btn btn-secondary">{{#str}}deleteselected, moodle{{/str}}</button>
             </div>
         {{/existingcontexts}}
diff --git a/admin/tool/dataprivacy/templates/data_registry_compliance.mustache b/admin/tool/dataprivacy/templates/data_registry_compliance.mustache
index ab66f577483..2e377a86810 100644
--- a/admin/tool/dataprivacy/templates/data_registry_compliance.mustache
+++ b/admin/tool/dataprivacy/templates/data_registry_compliance.mustache
@@ -51,7 +51,7 @@
         <dd>{{#str}}userlistexplanation, tool_dataprivacy{{/str}}</dd>
     </dl>
     <hr />
-    <div class="clearfix"><a class="tool_dataprivacy-expand-all float-right" href="#" data-visibility-state='visible'>{{#str}}visible, tool_dataprivacy{{/str}}</a></div>
+    <div class="clearfix"><a class="tool_dataprivacy-expand-all float-end" href="#" data-visibility-state='visible'>{{#str}}visible, tool_dataprivacy{{/str}}</a></div>
     {{#types}}
     <div>
         <div>
diff --git a/admin/tool/dataprivacy/templates/data_requests.mustache b/admin/tool/dataprivacy/templates/data_requests.mustache
index a1e4c598edd..e7c7b826ac6 100644
--- a/admin/tool/dataprivacy/templates/data_requests.mustache
+++ b/admin/tool/dataprivacy/templates/data_requests.mustache
@@ -61,7 +61,7 @@
 
 <div data-region="datarequests">
     <div class="mt-1 mb-1">
-        <div class="float-right">
+        <div class="float-end">
             <a href="{{newdatarequesturl}}" class="btn btn-primary" data-action="new-request">
                 {{#str}}newrequest, tool_dataprivacy{{/str}}
             </a>
diff --git a/admin/tool/dataprivacy/templates/data_requests_bulk_actions.mustache b/admin/tool/dataprivacy/templates/data_requests_bulk_actions.mustache
index 1f985626d55..561e52abd7f 100644
--- a/admin/tool/dataprivacy/templates/data_requests_bulk_actions.mustache
+++ b/admin/tool/dataprivacy/templates/data_requests_bulk_actions.mustache
@@ -45,7 +45,7 @@
     }
 }}
 <div class="mt-1 d-inline-block w-100">
-    <div class="float-left">
+    <div class="float-start">
         <select id="bulk-action" class="select custom-select">
         {{#options}}
             <option value="{{ value }}">{{ name }}</option>
@@ -53,7 +53,7 @@
         </select>
         <button class="btn btn-primary" id="confirm-bulk-action">{{# str}} confirm {{/ str}}</button>
     </div>
-    <div class="float-right">
+    <div class="float-end">
         {{{ perpage }}}
     </div>
 </div>
diff --git a/admin/tool/dataprivacy/templates/request_details.mustache b/admin/tool/dataprivacy/templates/request_details.mustache
index 65815ac3cdf..f4709bca52a 100644
--- a/admin/tool/dataprivacy/templates/request_details.mustache
+++ b/admin/tool/dataprivacy/templates/request_details.mustache
@@ -66,15 +66,15 @@
             </h4>
             <a href="mailto:{{foruser.email}}">{{foruser.email}}</a>
             <div class="clearfix mt-1 mb-1">
-            <span class="float-left me-1">
+            <span class="float-start me-1">
                 <strong>{{#str}}daterequesteddetail, tool_dataprivacy{{/str}}</strong>
                 {{#userdate}} {{timecreated}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}
             </span>
-                <span class="float-left me-1">
+                <span class="float-start me-1">
                 <strong>{{#str}}statusdetail, tool_dataprivacy{{/str}}</strong>
                 <span class="badge {{statuslabelclass}}">{{statuslabel}}</span>
             </span>
-            <span class="float-left me-1">
+            <span class="float-start me-1">
                 <strong>{{#str}}requestbydetail, tool_dataprivacy{{/str}}</strong>
                 <span><a href="{{requestedbyuser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{requestedbyuser.fullname}}</a></span>
             </span>
diff --git a/admin/tool/lp/templates/competencies_move_tree.mustache b/admin/tool/lp/templates/competencies_move_tree.mustache
index ff8d078ae3f..c20be2f7b64 100644
--- a/admin/tool/lp/templates/competencies_move_tree.mustache
+++ b/admin/tool/lp/templates/competencies_move_tree.mustache
@@ -53,7 +53,7 @@
 </ul>
 </div>
 
-<div data-region="move-buttons" class="float-sm-right">
+<div data-region="move-buttons" class="float-sm-end">
     <input type="button" data-action="move" class="btn btn-primary" value="{{#str}}move{{/str}}"/>
     <input type="button" data-action="cancel" class="btn btn-secondary" value="{{#str}}cancel{{/str}}"/>
 </div>
diff --git a/admin/tool/lp/templates/competency_grader.mustache b/admin/tool/lp/templates/competency_grader.mustache
index 6677cd91787..9827b42ee3d 100644
--- a/admin/tool/lp/templates/competency_grader.mustache
+++ b/admin/tool/lp/templates/competency_grader.mustache
@@ -50,7 +50,7 @@
                 <textarea name="comment" id="comment_{{uniqid}}" class="form-control mb-1"></textarea>
             </div>
         </div>
-        <div data-region="footer" class="float-sm-right">
+        <div data-region="footer" class="float-sm-end">
             <button data-action="rate" class="btn btn-primary">{{#str}}rate, tool_lp{{/str}}</button>
             <button data-action="cancel" class="btn btn-secondary">{{#str}}cancel{{/str}}</button>
         </div>
diff --git a/admin/tool/lp/templates/competency_picker.mustache b/admin/tool/lp/templates/competency_picker.mustache
index 87e42299827..a7fc1616309 100644
--- a/admin/tool/lp/templates/competency_picker.mustache
+++ b/admin/tool/lp/templates/competency_picker.mustache
@@ -78,7 +78,7 @@
         </ul>
     </li>
 </ul>
-<div data-region="link-buttons" class="mt-1 float-sm-right">
+<div data-region="link-buttons" class="mt-1 float-sm-end">
     <input type="button" class="btn btn-primary" data-action="add" value="{{#str}}add{{/str}}"/>
     <input type="button" class="btn btn-secondary" data-action="cancel" value="{{#str}}cancel{{/str}}"/>
 </div>
diff --git a/admin/tool/lp/templates/competency_picker_competencyform.mustache b/admin/tool/lp/templates/competency_picker_competencyform.mustache
index f9d3131e022..46359cf899d 100644
--- a/admin/tool/lp/templates/competency_picker_competencyform.mustache
+++ b/admin/tool/lp/templates/competency_picker_competencyform.mustache
@@ -60,7 +60,7 @@
         </ul>
     </li>
 </ul>
-<div data-region="link-buttons" class="mt-1 float-sm-right">
+<div data-region="link-buttons" class="mt-1 float-sm-end">
     <input type="button" class="btn btn-primary" data-action="add" value="{{#str}}select{{/str}}"/>
     <input type="button" class="btn btn-secondary" data-action="cancel" value="{{#str}}cancel{{/str}}"/>
 </div>
diff --git a/admin/tool/lp/templates/competency_picker_user_plans.mustache b/admin/tool/lp/templates/competency_picker_user_plans.mustache
index 5a1c561c20f..b1861ffaff2 100644
--- a/admin/tool/lp/templates/competency_picker_user_plans.mustache
+++ b/admin/tool/lp/templates/competency_picker_user_plans.mustache
@@ -84,7 +84,7 @@
     </li>
 </ul>
 
-<div data-region="link-buttons" class="mt-1 float-sm-right">
+<div data-region="link-buttons" class="mt-1 float-sm-end">
     <input type="button" class="btn btn-primary" data-action="add" value="{{#str}}add{{/str}}"/>
     <input type="button" class="btn btn-secondary" data-action="cancel" value="{{#str}}cancel{{/str}}"/>
 </div>
diff --git a/admin/tool/lp/templates/competency_plan_navigation.mustache b/admin/tool/lp/templates/competency_plan_navigation.mustache
index 66747cbe855..df6ed84e7fe 100644
--- a/admin/tool/lp/templates/competency_plan_navigation.mustache
+++ b/admin/tool/lp/templates/competency_plan_navigation.mustache
@@ -32,7 +32,7 @@
 
     // No example context because the JS is connected to webservices
 }}
-<div class="float-sm-right border p-2 mb-2">
+<div class="float-sm-end border p-2 mb-2">
 {{#hascompetencies}}
 <span>
 <label for="competency-nav-{{uniqid}}" class="accesshide">{{#str}}jumptocompetency, tool_lp{{/str}}</label>
diff --git a/admin/tool/lp/templates/competency_rule_config.mustache b/admin/tool/lp/templates/competency_rule_config.mustache
index 63e1264cbe7..d4e60d3e2a8 100644
--- a/admin/tool/lp/templates/competency_rule_config.mustache
+++ b/admin/tool/lp/templates/competency_rule_config.mustache
@@ -81,7 +81,7 @@
         {{/config}}
     </div>
 
-    <div data-region="footer" class="float-sm-right mt-1">
+    <div data-region="footer" class="float-sm-end mt-1">
         {{#config}}
         <input type="button" class="btn btn-primary" data-action="save" value="{{#str}}savechanges{{/str}}"/>
         {{/config}}
diff --git a/admin/tool/lp/templates/competency_summary.mustache b/admin/tool/lp/templates/competency_summary.mustache
index 74251dbcfa1..79135652bf0 100644
--- a/admin/tool/lp/templates/competency_summary.mustache
+++ b/admin/tool/lp/templates/competency_summary.mustache
@@ -70,7 +70,7 @@
 <p>{{{competency.description}}}</p>
 {{/competency.description}}
 {{#comppath}}
-    <span class="float-left">{{#str}}path, tool_lp{{/str}}&nbsp;</span>{{> tool_lp/competency_path }}
+    <span class="float-start">{{#str}}path, tool_lp{{/str}}&nbsp;</span>{{> tool_lp/competency_path }}
 {{/comppath}}
 {{#showrelatedcompetencies}}
     {{> tool_lp/related_competencies }}
diff --git a/admin/tool/lp/templates/course_competencies_page.mustache b/admin/tool/lp/templates/course_competencies_page.mustache
index 6837bfdebe0..7a386ac9fb3 100644
--- a/admin/tool/lp/templates/course_competencies_page.mustache
+++ b/admin/tool/lp/templates/course_competencies_page.mustache
@@ -25,7 +25,7 @@
 }}
 <div data-region="coursecompetenciespage">
     <div data-region="actions" class="clearfix">
-        <div class="float-sm-left">
+        <div class="float-sm-start">
             {{#canmanagecoursecompetencies}}
                 <button class="btn btn-secondary" disabled>{{#str}}addcoursecompetencies, tool_lp{{/str}}</button>
             {{/canmanagecoursecompetencies}}
@@ -61,8 +61,8 @@
     <tr class="drag-samenode" data-id="{{competency.id}}">
     <td>
         {{#canmanagecoursecompetencies}}
-        <span class="drag-handlecontainer float-sm-left"></span>
-        <div class="float-sm-right">
+        <span class="drag-handlecontainer float-sm-start"></span>
+        <div class="float-sm-end">
             <a href="#" data-action="delete-competency-link" data-id="{{competency.id}}">
                 {{#pix}}t/delete, core, {{#str}}delete{{/str}}{{/pix}}
             </a>
@@ -78,7 +78,7 @@
             <p>{{{competency.description}}}</p>
         {{/competency}}
         {{#comppath}}
-            <span class="float-sm-left">{{#str}}path, tool_lp{{/str}}&nbsp;</span>{{> tool_lp/competency_path }}
+            <span class="float-sm-start">{{#str}}path, tool_lp{{/str}}&nbsp;</span>{{> tool_lp/competency_path }}
         {{/comppath}}
         {{#usercompetencycourse}}
             {{#grade}}
diff --git a/admin/tool/lp/templates/course_competency_settings.mustache b/admin/tool/lp/templates/course_competency_settings.mustache
index a43908ca9be..97f34e88c4a 100644
--- a/admin/tool/lp/templates/course_competency_settings.mustache
+++ b/admin/tool/lp/templates/course_competency_settings.mustache
@@ -49,7 +49,7 @@
         </label>
 
     </fieldset>
-    <fieldset class="float-sm-right">
+    <fieldset class="float-sm-end">
         <input type="button" class="btn btn-primary" data-action="save" value="{{#str}}savechanges{{/str}}"/>
         <input type="button" class="btn btn-secondary" data-action="cancel" value="{{#str}}cancel{{/str}}"/>
     </fieldset>
diff --git a/admin/tool/lp/templates/evidence_summary.mustache b/admin/tool/lp/templates/evidence_summary.mustache
index a0922d59491..6b324578b02 100644
--- a/admin/tool/lp/templates/evidence_summary.mustache
+++ b/admin/tool/lp/templates/evidence_summary.mustache
@@ -46,7 +46,7 @@
 }}
 <div class="border p-2 mb-2 evidence" data-region="evidence" data-id="{{id}}">
     {{#candelete}}
-        <div class="float-sm-right">
+        <div class="float-sm-end">
             <a href="#" data-action="delete-evidence">{{#pix}}t/delete{{/pix}}</a>
         </div>
     {{/candelete}}
diff --git a/admin/tool/lp/templates/form_competency_list.mustache b/admin/tool/lp/templates/form_competency_list.mustache
index 4500c147749..fe0f14ab146 100644
--- a/admin/tool/lp/templates/form_competency_list.mustache
+++ b/admin/tool/lp/templates/form_competency_list.mustache
@@ -48,7 +48,7 @@
 <ul>
     {{#competencies}}
         <li>
-            <div class="float-right">
+            <div class="float-end">
                 <a href="#" data-action="deselect-competency" data-id="{{id}}">{{#pix}}t/delete, core, {{#str}}delete{{/str}}{{/pix}}</a>
             </div>
             <p>
diff --git a/admin/tool/lp/templates/manage_competencies_page.mustache b/admin/tool/lp/templates/manage_competencies_page.mustache
index 22eeb89ed6a..ec84f55adfa 100644
--- a/admin/tool/lp/templates/manage_competencies_page.mustache
+++ b/admin/tool/lp/templates/manage_competencies_page.mustache
@@ -68,7 +68,7 @@
             <div class="border p-2 mb-2">
                 <div class="card-title">
                     <h4 data-region="selected-competency">{{#str}}selectedcompetency, tool_lp{{/str}}</h4>
-                        <span data-region="competencyactionsmenu" class="float-sm-right">
+                        <span data-region="competencyactionsmenu" class="float-sm-end">
                             <ul title="{{#str}}edit{{/str}}" class="competencyactionsmenu">
                                 <li>
                                     <a href="#">{{#str}}edit{{/str}}</a><b class="caret"></b>
diff --git a/admin/tool/lp/templates/manage_competency_frameworks_page.mustache b/admin/tool/lp/templates/manage_competency_frameworks_page.mustache
index 987befa598d..f437d9cf704 100644
--- a/admin/tool/lp/templates/manage_competency_frameworks_page.mustache
+++ b/admin/tool/lp/templates/manage_competency_frameworks_page.mustache
@@ -34,7 +34,7 @@
     * navigation - array of strings containing buttons for navigation
 }}
 <div data-region="managecompetencies">
-<div class="float-left">
+<div class="float-start">
     {{#navigation}}
     {{{.}}}
     {{/navigation}}
diff --git a/admin/tool/lp/templates/manage_templates_page.mustache b/admin/tool/lp/templates/manage_templates_page.mustache
index d892f801f99..4b366ad2853 100644
--- a/admin/tool/lp/templates/manage_templates_page.mustache
+++ b/admin/tool/lp/templates/manage_templates_page.mustache
@@ -32,7 +32,7 @@
     * navigation - array of strings containing buttons for navigation
 }}
 <div data-region="managetemplates">
-<div class="float-left">
+<div class="float-start">
     {{#navigation}}
     {{{.}}}
     {{/navigation}}
diff --git a/admin/tool/lp/templates/module_navigation.mustache b/admin/tool/lp/templates/module_navigation.mustache
index 4b68402c0a9..a81c4770c3f 100644
--- a/admin/tool/lp/templates/module_navigation.mustache
+++ b/admin/tool/lp/templates/module_navigation.mustache
@@ -28,7 +28,7 @@
 
     // No example context because the JS is connected to webservices
 }}
-<div class="float-right border mb-2 p-2">
+<div class="float-end border mb-2 p-2">
 <form class="user-competency-course-navigation">
 <input type="hidden" name="courseid" value="{{courseid}}"/>
 <input type="hidden" name="mod" value="{{moduleid}}"/>
diff --git a/admin/tool/lp/templates/plan_page.mustache b/admin/tool/lp/templates/plan_page.mustache
index ae2950d9af0..747aca6c0aa 100644
--- a/admin/tool/lp/templates/plan_page.mustache
+++ b/admin/tool/lp/templates/plan_page.mustache
@@ -26,7 +26,7 @@
     </h2>
     {{#plan.canbeedited}}
     <div data-region="actions" class="clearfix">
-        <div class="float-left">
+        <div class="float-start">
             <!-- Button to add competencies to the plan -->
             <button class="btn btn-secondary" data-action="add">{{#pix}}t/add{{/pix}} {{#str}}addcompetency, tool_lp{{/str}}</button>
         </div>
@@ -129,13 +129,13 @@
                         data-userid="{{plan.userid}}">
                     <td>
                         {{#plan.canbeedited}}
-                        <span class="drag-handlecontainer float-left"></span>
+                        <span class="drag-handlecontainer float-start"></span>
                         {{/plan.canbeedited}}
                         <a data-usercompetency="true" href="#">{{{competency.shortname}}}</a>
                         <em>{{competency.idnumber}}</em>
                         {{#comppath}}
                             <br>
-                            <span class="float-left">{{#str}}path, tool_lp{{/str}}&nbsp;</span>{{> tool_lp/competency_path }}
+                            <span class="float-start">{{#str}}path, tool_lp{{/str}}&nbsp;</span>{{> tool_lp/competency_path }}
                         {{/comppath}}
                     </td>
                     {{#plan.iscompleted}}
diff --git a/admin/tool/lp/templates/plans_page.mustache b/admin/tool/lp/templates/plans_page.mustache
index 6e93d853037..17e0d4bad2f 100644
--- a/admin/tool/lp/templates/plans_page.mustache
+++ b/admin/tool/lp/templates/plans_page.mustache
@@ -34,7 +34,7 @@
 }}
 
 <div data-region="plans">
-<div class="float-left">
+<div class="float-start">
     {{#navigation}}
     {{{.}}}
     {{/navigation}}
@@ -155,7 +155,7 @@
 {{/plans}}
 
 {{#canreaduserevidence}}
-<div class="float-left">
+<div class="float-start">
     <a href="{{pluginbaseurl}}/user_evidence_list.php?userid={{userid}}">{{#str}}userevidence, tool_lp{{/str}}</a>
 </div>
 {{/canreaduserevidence}}
diff --git a/admin/tool/lp/templates/related_competencies.mustache b/admin/tool/lp/templates/related_competencies.mustache
index c51eaa92bd4..9f56eaef675 100644
--- a/admin/tool/lp/templates/related_competencies.mustache
+++ b/admin/tool/lp/templates/related_competencies.mustache
@@ -54,7 +54,7 @@
     {{#relatedcompetencies}}
         <li>
             {{#showdeleterelatedaction}}
-                <div class="float-sm-right">
+                <div class="float-sm-end">
                     <a href="#" data-action="deleterelation" id="id-related-{{id}}">{{#pix}}t/delete, core, {{#str}}delete{{/str}}{{/pix}}</a>
                 </div>
             {{/showdeleterelatedaction}}
diff --git a/admin/tool/lp/templates/scale_configuration_page.mustache b/admin/tool/lp/templates/scale_configuration_page.mustache
index 2ccf87968cd..591e92d79f5 100644
--- a/admin/tool/lp/templates/scale_configuration_page.mustache
+++ b/admin/tool/lp/templates/scale_configuration_page.mustache
@@ -58,7 +58,7 @@
 </table>
 </div>
 
-<div data-region="scale-buttons" class="mt-1 float-sm-right">
+<div data-region="scale-buttons" class="mt-1 float-sm-end">
     <input type="button" class="btn btn-secondary" data-action="close" value="{{#str}}closebuttontitle{{/str}}"/>
     <input type="button" class="btn btn-secondary" data-action="cancel" value="{{#str}}cancel{{/str}}"/>
 </div>
diff --git a/admin/tool/lp/templates/template_competencies_page.mustache b/admin/tool/lp/templates/template_competencies_page.mustache
index 1445813b280..a1d7580669a 100644
--- a/admin/tool/lp/templates/template_competencies_page.mustache
+++ b/admin/tool/lp/templates/template_competencies_page.mustache
@@ -41,8 +41,8 @@
                 <div class="drag-samenode" data-id="{{competency.id}}">
                     <div class="border p-2 mb-2">
                         {{#canmanagetemplatecompetencies}}
-                        <span class="drag-handlecontainer float-left"></span>
-                        <div class="float-sm-right">
+                        <span class="drag-handlecontainer float-start"></span>
+                        <div class="float-sm-end">
                             <a href="#" data-action="delete-competency-link" data-id="{{competency.id}}">{{#pix}}t/delete, core, {{#str}}delete{{/str}}{{/pix}}</a>
                         </div>
                         {{/canmanagetemplatecompetencies}}
diff --git a/admin/tool/lp/templates/user_competency_course_navigation.mustache b/admin/tool/lp/templates/user_competency_course_navigation.mustache
index 2a9f2deeda4..2055e109a08 100644
--- a/admin/tool/lp/templates/user_competency_course_navigation.mustache
+++ b/admin/tool/lp/templates/user_competency_course_navigation.mustache
@@ -35,7 +35,7 @@
 
     // No example context because the JS is connected to webservices
 }}
-<div class="float-sm-right border p-2 mb-2">
+<div class="float-sm-end border p-2 mb-2">
 <p>{{{groupselector}}}</p>
 <form class="user-competency-course-navigation">
 <input type="hidden" name="userid" value="{{userid}}"/>
diff --git a/admin/tool/lp/templates/user_competency_summary.mustache b/admin/tool/lp/templates/user_competency_summary.mustache
index b1272077b27..7f0e615b49e 100644
--- a/admin/tool/lp/templates/user_competency_summary.mustache
+++ b/admin/tool/lp/templates/user_competency_summary.mustache
@@ -57,7 +57,7 @@
             </dd>
             <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
             <dd>
-                <span class="badge {{#proficiency}}bg-success{{/proficiency}}{{^proficiency}}bg-danger{{/proficiency}} text-white float-left">
+                <span class="badge {{#proficiency}}bg-success{{/proficiency}}{{^proficiency}}bg-danger{{/proficiency}} text-white float-start">
                     {{proficiencyname}}
                 </span>
             </dd>
diff --git a/admin/tool/lp/templates/user_competency_summary_in_course.mustache b/admin/tool/lp/templates/user_competency_summary_in_course.mustache
index d30a481558a..d06b920f0ad 100644
--- a/admin/tool/lp/templates/user_competency_summary_in_course.mustache
+++ b/admin/tool/lp/templates/user_competency_summary_in_course.mustache
@@ -81,7 +81,7 @@
         {{#usercompetencycourse}}
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge {{#proficiency}}bg-success{{/proficiency}}{{^proficiency}}bg-danger{{/proficiency}} text-white float-left">
+            <span class="badge {{#proficiency}}bg-success{{/proficiency}}{{^proficiency}}bg-danger{{/proficiency}} text-white float-start">
                 {{proficiencyname}}
             </span>
         </dd>
diff --git a/admin/tool/lp/templates/user_competency_summary_in_plan.mustache b/admin/tool/lp/templates/user_competency_summary_in_plan.mustache
index c09ae6c6e97..9f173dbd58a 100644
--- a/admin/tool/lp/templates/user_competency_summary_in_plan.mustache
+++ b/admin/tool/lp/templates/user_competency_summary_in_plan.mustache
@@ -68,7 +68,7 @@
         </dd>
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge {{#proficiency}}bg-success{{/proficiency}}{{^proficiency}}bg-danger{{/proficiency}} text-white float-left">
+            <span class="badge {{#proficiency}}bg-success{{/proficiency}}{{^proficiency}}bg-danger{{/proficiency}} text-white float-start">
                 {{proficiencyname}}
             </span>
         </dd>
@@ -101,7 +101,7 @@
         <dd>{{gradename}} - {{#str}}plancompleted, tool_lp{{/str}}</dd>
         <dt>{{#str}}proficient, tool_lp{{/str}}</dt>
         <dd>
-            <span class="badge {{#proficiency}}bg-success{{/proficiency}}{{^proficiency}}bg-danger{{/proficiency}} text-white float-left">
+            <span class="badge {{#proficiency}}bg-success{{/proficiency}}{{^proficiency}}bg-danger{{/proficiency}} text-white float-start">
                 {{proficiencyname}}
             </span>
         </dd>
diff --git a/admin/tool/lp/templates/user_evidence_list_page.mustache b/admin/tool/lp/templates/user_evidence_list_page.mustache
index 3711d9e0879..a1b61af5762 100644
--- a/admin/tool/lp/templates/user_evidence_list_page.mustache
+++ b/admin/tool/lp/templates/user_evidence_list_page.mustache
@@ -33,7 +33,7 @@
 }}
 
 <div data-region="user-evidence-list">
-<div class="float-left">
+<div class="float-start">
     {{#navigation}}
         {{{.}}}
     {{/navigation}}
diff --git a/admin/tool/lp/templates/user_evidence_page.mustache b/admin/tool/lp/templates/user_evidence_page.mustache
index 8cd5a020229..bbdcf222a10 100644
--- a/admin/tool/lp/templates/user_evidence_page.mustache
+++ b/admin/tool/lp/templates/user_evidence_page.mustache
@@ -38,7 +38,7 @@
     </h2>
     {{#canmanage}}
     <div data-region="actions" class="clearfix">
-        <div class="float-left">
+        <div class="float-start">
             {{#userhasplan}}
                 <button class="btn btn-secondary mb-1" data-action="link-competency">{{#pix}}t/add{{/pix}} {{#str}}linkcompetencies, tool_lp{{/str}}</button>
             {{/userhasplan}}
@@ -85,7 +85,7 @@
                     </td>
                     {{#userevidence.canmanage}}
                         <td>
-                            <div class="float-left">
+                            <div class="float-start">
                                 <a href="#" data-action="delete-competency-link" data-id="{{competency.id}}">{{#pix}}t/delete, core, {{#str}}delete{{/str}}{{/pix}}</a>
                             </div>
                         </td>
diff --git a/admin/tool/mfa/factor/sms/classes/factor.php b/admin/tool/mfa/factor/sms/classes/factor.php
index d136fe62874..cc773d7969d 100644
--- a/admin/tool/mfa/factor/sms/classes/factor.php
+++ b/admin/tool/mfa/factor/sms/classes/factor.php
@@ -168,7 +168,7 @@ class factor extends object_factor_base {
             get_string('editphonenumber', 'factor_sms'),
             ['class' => 'btn btn-secondary', 'type' => 'button']);
 
-        $mform->addElement('html', \html_writer::tag('div', $editphonenumber, ['class' => 'float-sm-left col-md-4']));
+        $mform->addElement('html', \html_writer::tag('div', $editphonenumber, ['class' => 'float-sm-start col-md-4']));
 
         // Disable the form check prompt.
         $mform->disable_form_change_checker();
diff --git a/admin/tool/policy/templates/page_agreedocs.mustache b/admin/tool/policy/templates/page_agreedocs.mustache
index 046eb8338ad..d266c8ba62a 100644
--- a/admin/tool/policy/templates/page_agreedocs.mustache
+++ b/admin/tool/policy/templates/page_agreedocs.mustache
@@ -60,14 +60,14 @@
 
 {{#behalfuser}}
 <div class="clearfix">
-    <div class="float-right mb-2">
+    <div class="float-end mb-2">
         {{# str }} viewconsentpageforuser, tool_policy, {{{ . }}} {{/ str }}
     </div>
 </div>
 {{/behalfuser}}
 
 <div class="clearfix">
-    <div class="float-left">
+    <div class="float-start">
         <h2>{{# str }}consentpagetitle, tool_policy{{/ str }}</h2>
     </div>
 </div>
diff --git a/admin/tool/policy/templates/page_viewalldoc.mustache b/admin/tool/policy/templates/page_viewalldoc.mustache
index 49f2dfe1412..d6a139ef917 100644
--- a/admin/tool/policy/templates/page_viewalldoc.mustache
+++ b/admin/tool/policy/templates/page_viewalldoc.mustache
@@ -100,7 +100,7 @@
             <h3>{{# str }} policydoccontent, tool_policy {{/ str }}</h3>
             {{{content}}}
         </div>
-        <div class="float-right">
+        <div class="float-end">
             <a href="#top">
                 {{# str }} backtotop, tool_policy {{/ str }}
                 <i class="icon text-primary fa fa-caret-up" title="{{# str }} backtotop, tool_policy {{/ str }}" ></i>
diff --git a/admin/tool/policy/templates/page_viewdoc.mustache b/admin/tool/policy/templates/page_viewdoc.mustache
index 360ad3d259f..5df37a7513b 100644
--- a/admin/tool/policy/templates/page_viewdoc.mustache
+++ b/admin/tool/policy/templates/page_viewdoc.mustache
@@ -45,11 +45,11 @@
 
 <a id="top"></a>
 <div class="clearfix">
-    <div class="float-left">
+    <div class="float-start">
         <h2>{{{policy.name}}}</h2>
     </div>
     {{# numpolicy }}
-        <div class="float-right">
+        <div class="float-end">
             {{# str }} steppolicies, tool_policy,
                 { "numpolicy": {{# quote }}{{numpolicy}}{{/quote }}, "totalpolicies": {{# quote }}{{totalpolicies}}{{/ quote }} }
             {{/ str }}
@@ -96,7 +96,7 @@
         <a role="button" href="{{declineurl}}" class="btn btn-link">{{#str}} idontagree, tool_policy, {{{policy.name}}} {{/str}}</a>
     {{/declineurl}}
 
-    <div class="float-right">
+    <div class="float-end">
         <a href="#top">
             {{# str }} backtotop, tool_policy {{/ str }}
             <i class="icon text-primary fa fa-caret-up" title="{{# str }} backtotop, tool_policy {{/ str }}" ></i>
diff --git a/blocks/timeline/templates/event-list-item.mustache b/blocks/timeline/templates/event-list-item.mustache
index f8cc20be031..f54e760fe83 100644
--- a/blocks/timeline/templates/event-list-item.mustache
+++ b/blocks/timeline/templates/event-list-item.mustache
@@ -67,7 +67,7 @@
             <div class="event-name-container flex-grow-1 line-height-3 nowrap text-truncate">
                 <div class="d-flex">
                     <h6 class="event-name mb-0 pb-1 text-truncate">
-                        {{#overdue}}<span class="badge rounded-pill bg-danger text-white ms-1 float-right">{{#str}} overdue, block_timeline {{/str}}</span>{{/overdue}}
+                        {{#overdue}}<span class="badge rounded-pill bg-danger text-white ms-1 float-end">{{#str}} overdue, block_timeline {{/str}}</span>{{/overdue}}
                         <a href="{{url}}"
                                 title="{{name}}"
                                 aria-label='{{#cleanstr}} ariaeventlistitem, block_timeline, { "name": {{#quote}}{{{activityname}}}{{/quote}}, "course": {{#quote}}{{{course.fullnamedisplay}}}{{/quote}}, "date": "{{#userdate}} {{timesort}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}" } {{/cleanstr}}'>
diff --git a/blog/rsslib.php b/blog/rsslib.php
index 04bbef4c60e..47249d153c1 100644
--- a/blog/rsslib.php
+++ b/blog/rsslib.php
@@ -83,7 +83,7 @@ function blog_rss_print_link($context, $filtertype, $filterselect = 0, $tagid =
 
     $url = blog_rss_get_url($context->id, $userid, $filtertype, $filterselect, $tagid);
     $rsspix = $OUTPUT->pix_icon('i/rss', get_string('rss'), 'core', array('title' => $tooltiptext));
-    print '<div class="float-sm-right"><a href="'. $url .'">' . $rsspix . '</a></div>';
+    print '<div class="float-sm-end"><a href="'. $url .'">' . $rsspix . '</a></div>';
 }
 
 /**
diff --git a/calendar/renderer.php b/calendar/renderer.php
index 891c5233e81..4aae37e8129 100644
--- a/calendar/renderer.php
+++ b/calendar/renderer.php
@@ -116,7 +116,7 @@ class core_calendar_renderer extends plugin_renderer_base {
                 $deletelink = null;
             }
 
-            $commands  = html_writer::start_tag('div', array('class' => 'commands float-sm-right'));
+            $commands  = html_writer::start_tag('div', array('class' => 'commands float-sm-end'));
             $commands .= html_writer::start_tag('a', array('href' => $editlink));
             $str = get_string('tt_editevent', 'calendar');
             $commands .= $this->output->pix_icon('t/edit', $str);
@@ -160,9 +160,9 @@ class core_calendar_renderer extends plugin_renderer_base {
             $output .= html_writer::tag('div', $event->courselink);
         }
         if (!empty($event->time)) {
-            $output .= html_writer::tag('span', $event->time, array('class' => 'date float-sm-right me-1'));
+            $output .= html_writer::tag('span', $event->time, array('class' => 'date float-sm-end me-1'));
         } else {
-            $attrs = array('class' => 'date float-sm-right me-1');
+            $attrs = array('class' => 'date float-sm-end me-1');
             $output .= html_writer::tag('span', calendar_time_representation($event->timestart), $attrs);
         }
 
@@ -277,10 +277,10 @@ class core_calendar_renderer extends plugin_renderer_base {
     public function render_subscriptions_header(): string {
         $importcalendarbutton = new single_button(new moodle_url('/calendar/import.php', calendar_get_export_import_link_params()),
                 get_string('importcalendar', 'calendar'), 'get', single_button::BUTTON_PRIMARY);
-        $importcalendarbutton->class .= ' float-sm-right float-right';
+        $importcalendarbutton->class .= ' float-sm-end float-end';
         $exportcalendarbutton = new single_button(new moodle_url('/calendar/export.php', calendar_get_export_import_link_params()),
                 get_string('exportcalendar', 'calendar'), 'get', single_button::BUTTON_PRIMARY);
-        $exportcalendarbutton->class .= ' float-sm-right float-right';
+        $exportcalendarbutton->class .= ' float-sm-end float-end';
         $output = $this->output->heading(get_string('managesubscriptions', 'calendar'));
         $output .= html_writer::start_div('header d-flex flex-wrap mt-5');
         $headerattr = [
@@ -395,7 +395,7 @@ class core_calendar_renderer extends plugin_renderer_base {
      * @return string
      */
     protected function subscription_action_links(): string {
-        $html = html_writer::start_tag('div', array('class' => 'btn-group float-left'));
+        $html = html_writer::start_tag('div', array('class' => 'btn-group float-start'));
         $html .= html_writer::span(html_writer::link('#', get_string('delete'),
             ['data-action' => 'delete-subscription']), '');
         $html .= html_writer::end_tag('div');
diff --git a/calendar/templates/add_event_button.mustache b/calendar/templates/add_event_button.mustache
index 06cdebfd80d..e46734ebbc9 100644
--- a/calendar/templates/add_event_button.mustache
+++ b/calendar/templates/add_event_button.mustache
@@ -34,7 +34,7 @@
 }}
 {{#defaulteventcontext}}
 <button{{!
-    }} class="btn btn-primary float-sm-right float-right ml-1 mb-2"{{!
+    }} class="btn btn-primary float-sm-end float-end ms-1 mb-2"{{!
     }} data-context-id="{{defaulteventcontext}}"{{!
     }} data-action="new-event-button"{{!
     }}>
diff --git a/calendar/templates/event_item.mustache b/calendar/templates/event_item.mustache
index abb2054e36c..b666187d8d4 100644
--- a/calendar/templates/event_item.mustache
+++ b/calendar/templates/event_item.mustache
@@ -61,7 +61,7 @@
     }}>
     <div class="card rounded">
         <div class="box card-header clearfix calendar_event_{{normalisedeventtype}}">
-            <div class="commands float-sm-right">
+            <div class="commands float-sm-end">
                 {{#canedit}}
                     {{#candelete}}
                         <a href="{{deleteurl}}" data-action="delete" aria-label="{{#str}}delete{{/str}}" title="{{#str}}delete{{/str}}">
diff --git a/course/classes/management_renderer.php b/course/classes/management_renderer.php
index 4a20438e227..c9cfa18541a 100644
--- a/course/classes/management_renderer.php
+++ b/course/classes/management_renderer.php
@@ -211,7 +211,7 @@ class core_course_management_renderer extends plugin_renderer_base {
                     $viewcaturl,
                     $icon,
                     array(
-                            'class' => 'float-left',
+                            'class' => 'float-start',
                             'data-action' => 'collapse',
                             'title' => get_string('collapsecategory', 'moodle', $text),
                             'aria-controls' => 'subcategoryof'.$category->id
@@ -224,7 +224,7 @@ class core_course_management_renderer extends plugin_renderer_base {
                     $viewcaturl,
                     $icon,
                     array(
-                            'class' => 'float-left',
+                            'class' => 'float-start',
                             'data-action' => 'expand',
                             'title' => get_string('expandcategory', 'moodle', $text)
                     )
@@ -235,14 +235,14 @@ class core_course_management_renderer extends plugin_renderer_base {
                     '',
                     'moodle',
                     array('class' => 'tree-icon'));
-            $icon = html_writer::span($icon, 'float-left');
+            $icon = html_writer::span($icon, 'float-start');
         }
         $actions = \core_course\management\helper::get_category_listitem_actions($category);
         $hasactions = !empty($actions) || $category->can_create_course();
 
         $html = html_writer::start_tag('li', $attributes);
         $html .= html_writer::start_div('clearfix');
-        $html .= html_writer::start_div('float-left ' . $checkboxclass);
+        $html .= html_writer::start_div('float-start ' . $checkboxclass);
         $html .= html_writer::start_div('custom-control custom-checkbox me-1 ');
         $html .= html_writer::empty_tag('input', $bcatinput);
         $labeltext = html_writer::span(get_string('bulkactionselect', 'moodle', $text), 'sr-only');
@@ -253,15 +253,15 @@ class core_course_management_renderer extends plugin_renderer_base {
         $html .= html_writer::end_div();
         $html .= $icon;
         if ($hasactions) {
-            $textattributes = array('class' => 'float-left categoryname aalink');
+            $textattributes = array('class' => 'float-start categoryname aalink');
         } else {
-            $textattributes = array('class' => 'float-left categoryname without-actions');
+            $textattributes = array('class' => 'float-start categoryname without-actions');
         }
         if (isset($textlabel)) {
             $textattributes['aria-label'] = $textlabel;
         }
         $html .= html_writer::link($viewcaturl, $text, $textattributes);
-        $html .= html_writer::start_div('float-right d-flex');
+        $html .= html_writer::start_div('float-end d-flex');
         if ($category->idnumber) {
             $html .= html_writer::tag('span', s($category->idnumber), array('class' => 'text-muted idnumber'));
         }
@@ -620,10 +620,10 @@ class core_course_management_renderer extends plugin_renderer_base {
 
         if ($category->can_resort_courses()) {
             // In order for dnd to be available the user must be able to resort the category children..
-            $html .= html_writer::div($this->output->pix_icon('i/move_2d', get_string('dndcourse')), 'float-left drag-handle');
+            $html .= html_writer::div($this->output->pix_icon('i/move_2d', get_string('dndcourse')), 'float-start drag-handle');
         }
 
-        $html .= html_writer::start_div('float-left ' . $checkboxclass);
+        $html .= html_writer::start_div('float-start ' . $checkboxclass);
         $html .= html_writer::start_div('custom-control custom-checkbox me-1 ');
         $html .= html_writer::empty_tag('input', $bulkcourseinput);
         $labeltext = html_writer::span(get_string('bulkactionselect', 'moodle', $text), 'sr-only');
@@ -1201,7 +1201,7 @@ class core_course_management_renderer extends plugin_renderer_base {
 
         $html  = html_writer::start_tag('li', $attributes);
         $html .= html_writer::start_div('clearfix');
-        $html .= html_writer::start_div('float-left');
+        $html .= html_writer::start_div('float-start');
         if ($bulkcourseinput) {
             $html .= html_writer::start_div('custom-control custom-checkbox me-1');
             $html .= html_writer::empty_tag('input', $bulkcourseinput);
@@ -1212,9 +1212,9 @@ class core_course_management_renderer extends plugin_renderer_base {
             $html .= html_writer::end_div();
         }
         $html .= html_writer::end_div();
-        $html .= html_writer::link($viewcourseurl, $text, array('class' => 'float-left coursename aalink'));
-        $html .= html_writer::tag('span', $categoryname, array('class' => 'float-left ms-3 text-muted'));
-        $html .= html_writer::start_div('float-right');
+        $html .= html_writer::link($viewcourseurl, $text, array('class' => 'float-start coursename aalink'));
+        $html .= html_writer::tag('span', $categoryname, array('class' => 'float-start ms-3 text-muted'));
+        $html .= html_writer::start_div('float-end');
         $html .= $this->search_listitem_actions($course);
         $html .= html_writer::tag('span', s($course->idnumber), array('class' => 'text-muted idnumber'));
         $html .= html_writer::end_div();
diff --git a/course/templates/activity_navigation.mustache b/course/templates/activity_navigation.mustache
index 8f2948c879f..d48a9faabf9 100644
--- a/course/templates/activity_navigation.mustache
+++ b/course/templates/activity_navigation.mustache
@@ -67,7 +67,7 @@
 <div class="mt-5 mb-1 activity-navigation container-fluid">
 {{< core/columns-1to1to1}}
     {{$column1}}
-        <div class="float-left">
+        <div class="float-start">
             {{#prevlink}}{{> core/action_link }}{{/prevlink}}
         </div>
     {{/column1}}
@@ -77,7 +77,7 @@
         </div>
     {{/column2}}
     {{$column3}}
-        <div class="float-right">
+        <div class="float-end">
             {{#nextlink}}{{> core/action_link }}{{/nextlink}}
         </div>
     {{/column3}}
diff --git a/customfield/classes/output/management.php b/customfield/classes/output/management.php
index 1ee9e67cca0..2fe4cb330f7 100644
--- a/customfield/classes/output/management.php
+++ b/customfield/classes/output/management.php
@@ -108,7 +108,7 @@ class management implements renderable, templatable {
                         'data-typename' => $fieldname]);
                 $menu->add($action);
             }
-            $menu->attributes['class'] .= ' float-left me-1';
+            $menu->attributes['class'] .= ' float-start me-1';
 
             $categoryarray['addfieldmenu'] = $output->render($menu);
 
diff --git a/customfield/templates/list.mustache b/customfield/templates/list.mustache
index 9e4cf28a425..511a27e95bb 100644
--- a/customfield/templates/list.mustache
+++ b/customfield/templates/list.mustache
@@ -62,7 +62,7 @@
     <div class="row">
         <div class="col align-self-end">
             {{#usescategories}}
-            <a tabindex="0" role="button" class="btn btn-secondary float-right" data-role="addnewcategory">{{#str}}addnewcategory, core_customfield{{/str}}</a>
+            <a tabindex="0" role="button" class="btn btn-secondary float-end" data-role="addnewcategory">{{#str}}addnewcategory, core_customfield{{/str}}</a>
             {{/usescategories}}
         </div>
     </div>
diff --git a/grade/report/singleview/classes/report/singleview.php b/grade/report/singleview/classes/report/singleview.php
index 717a3b2cf20..974baf0a552 100644
--- a/grade/report/singleview/classes/report/singleview.php
+++ b/grade/report/singleview/classes/report/singleview.php
@@ -191,7 +191,7 @@ class singleview extends grade_report {
                 ['data-action' => $type, 'data-role' => 'bulkaction']);
             $menu->add($action);
         }
-        $menu->attributes['class'] .= ' float-left my-auto';
+        $menu->attributes['class'] .= ' float-start my-auto';
 
         return $output->render($menu);
     }
diff --git a/lib/form/templates/filetypes-browser.mustache b/lib/form/templates/filetypes-browser.mustache
index 779122ee25f..cac13d18c0c 100644
--- a/lib/form/templates/filetypes-browser.mustache
+++ b/lib/form/templates/filetypes-browser.mustache
@@ -100,8 +100,8 @@
         {{#types.0}}
         {{! The tree provides its own accessibility controls, these two links are here for mouse users.
             For that reason, we hide them from assistive technologies. }}
-        <small aria-hidden="true" data-filetypesbrowserfeature="hideifexpanded" class="float-right float-right"><a href="#">{{#str}}expand{{/str}}</a></small>
-        <small aria-hidden="true" data-filetypesbrowserfeature="hideifcollapsed" class="float-right float-right"><a href="#">{{#str}}collapse{{/str}}</a></small>
+        <small aria-hidden="true" data-filetypesbrowserfeature="hideifexpanded" class="float-end"><a href="#">{{#str}}expand{{/str}}</a></small>
+        <small aria-hidden="true" data-filetypesbrowserfeature="hideifcollapsed" class="float-end"><a href="#">{{#str}}collapse{{/str}}</a></small>
         {{/types.0}}
         <ul class="unstyled list-unstyled" role="group">
             {{#types}}
diff --git a/lib/templates/block.mustache b/lib/templates/block.mustache
index fe61331c8a4..61808eb7867 100644
--- a/lib/templates/block.mustache
+++ b/lib/templates/block.mustache
@@ -43,7 +43,7 @@
         {{/title}}
 
         {{#hascontrols}}
-            <div class="block-controls float-right header">
+            <div class="block-controls float-end header">
                 {{{controls}}}
             </div>
         {{/hascontrols}}
diff --git a/lib/templates/filemanager_modal_generallayout.mustache b/lib/templates/filemanager_modal_generallayout.mustache
index 86577640d10..866cf50a780 100644
--- a/lib/templates/filemanager_modal_generallayout.mustache
+++ b/lib/templates/filemanager_modal_generallayout.mustache
@@ -63,7 +63,7 @@
                             </div>
                             <div class="fp-tb-message"></div>
                         </div>
-                        <div class="fp-viewbar btn-group float-sm-right">
+                        <div class="fp-viewbar btn-group float-sm-end">
                             <a role="button" title="{{#str}}displayicons, repository{{/str}}" class="fp-vb-icons btn btn-secondary btn-sm" href="#">
                                 {{#pix}}fp/view_icon_active, theme{{/pix}}
                             </a>
diff --git a/lib/templates/filemanager_page_generallayout.mustache b/lib/templates/filemanager_page_generallayout.mustache
index b4ed879b614..fe0810aea60 100644
--- a/lib/templates/filemanager_page_generallayout.mustache
+++ b/lib/templates/filemanager_page_generallayout.mustache
@@ -59,7 +59,7 @@
                     {{#pix}}i/loading_small{{/pix}}
                 </span>
             </div>
-            <div class="fp-viewbar btn-group float-sm-right">
+            <div class="fp-viewbar btn-group float-sm-end">
                 <a title="{{#str}}displayicons, repository{{/str}}" class="fp-vb-icons btn btn-secondary btn-sm" href="#">
                     {{#pix}}fp/view_icon_active, theme{{/pix}}
                 </a>
diff --git a/lib/templates/local/reactive/debuginstancepanel.mustache b/lib/templates/local/reactive/debuginstancepanel.mustache
index 761099a7f9f..107c399c141 100644
--- a/lib/templates/local/reactive/debuginstancepanel.mustache
+++ b/lib/templates/local/reactive/debuginstancepanel.mustache
@@ -37,7 +37,7 @@
             <button href="#" class="btn btn-secondary" data-for="pin" data-alt="{{#str}} reactive_pin , core_debug {{/str}}">
                 {{#str}} reactive_unpin , core_debug {{/str}}
             </button>
-            <button href="#" class="btn btn-danger float-right" data-for="close">
+            <button href="#" class="btn btn-danger float-end" data-for="close">
                 {{#str}} close , admin {{/str}}
             </button>
         </h5>
diff --git a/message/templates/message_drawer_view_conversation_header_content_type_private.mustache b/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
index 743624e523f..707e318d703 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
@@ -87,7 +87,7 @@
         aria-label="{{#str}} conversationactions, core_message {{/str}}" aria-controls="conversation-actions-menu">
             {{#pix}} i/moremenu, core {{/pix}}
         </button>
-        <div id="conversation-actions-menu" class="dropdown-menu float-right" role="menu"
+        <div id="conversation-actions-menu" class="dropdown-menu float-end" role="menu"
         aria-labelledby="conversation-actions-menu-button">
             <a class="dropdown-item" href="#" data-action="view-contact" role="menuitem">
                 {{#str}} info, core_message {{/str}}
diff --git a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
index e4df151b1ba..a692f73416d 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
@@ -81,7 +81,7 @@
             aria-label="{{#str}} conversationactions, core_message {{/str}}" aria-controls="conversation-actions-menu">
                 {{#pix}} i/moremenu, core {{/pix}}
             </button>
-            <div id="conversation-actions-menu" class="dropdown-menu float-right" role="menu"
+            <div id="conversation-actions-menu" class="dropdown-menu float-end" role="menu"
             aria-labelledby="conversation-actions-menu-button">
                 <a class="dropdown-item" href="#" data-action="view-group-info" role="menuitem">
                     {{#str}} groupinfo, core_message {{/str}}
diff --git a/mod/assign/templates/grading_app.mustache b/mod/assign/templates/grading_app.mustache
index f1889cd47f1..990dcadb303 100644
--- a/mod/assign/templates/grading_app.mustache
+++ b/mod/assign/templates/grading_app.mustache
@@ -57,7 +57,7 @@
 </div>
 <div data-region="grade-actions-panel">
 <div data-region="grade-actions">
-<div class="tool_usertours-resettourcontainer float-left"></div>
+<div class="tool_usertours-resettourcontainer float-start"></div>
 {{> mod_assign/grading_actions }}
 </div>
 </div>
diff --git a/mod/book/tool/print/templates/print_book.mustache b/mod/book/tool/print/templates/print_book.mustache
index da4b3ecdd1e..312d592f9af 100644
--- a/mod/book/tool/print/templates/print_book.mustache
+++ b/mod/book/tool/print/templates/print_book.mustache
@@ -65,7 +65,7 @@
     <div class="text-right">{{{ printdialoglink }}}</div>
     <div class="text-center pb-3 book_title">{{{ booktitle }}}</div>
     <div class="book_info w-100 pt-6 d-inline-block">
-        <div class="w-50 float-left">
+        <div class="w-50 float-start">
             <table>
                 <tr>
                     <td>
@@ -93,8 +93,8 @@
                 </tr>
             </table>
         </div>
-        <div class="w-50 float-left">
-            <table class="float-right">
+        <div class="w-50 float-start">
+            <table class="float-end">
                 <tr>
                     <td>
                         {{# str }} printedby, booktool_print {{/ str }}:
diff --git a/mod/data/templates/presets.mustache b/mod/data/templates/presets.mustache
index 3804658f634..ddcd688402f 100644
--- a/mod/data/templates/presets.mustache
+++ b/mod/data/templates/presets.mustache
@@ -86,7 +86,7 @@
                     <td class="p-4">{{description}}</td>
                     <td class="p-4 preset_action_menu">
                         {{#actions}}
-                            <div class="float-right">
+                            <div class="float-end">
                                 {{>core/action_menu}}
                             </div>
                         {{/actions}}
diff --git a/mod/forum/classes/output/subscription_actionbar.php b/mod/forum/classes/output/subscription_actionbar.php
index 58a7f4f6194..2938ecfe84a 100644
--- a/mod/forum/classes/output/subscription_actionbar.php
+++ b/mod/forum/classes/output/subscription_actionbar.php
@@ -111,7 +111,7 @@ class subscription_actionbar implements renderable, templatable {
         $urlselect = new url_select($menu, $this->currenturl, ['' => $set], 'selectsubscriptionoptions');
         $urlselect->set_label(get_string('subscriptionmode', 'mod_forum'), ['class' => 'me-1']);
         $urlselect->set_help_icon('subscriptionmode', 'mod_forum');
-        $urlselect->class .= ' float-right';
+        $urlselect->class .= ' float-end';
         return $urlselect;
     }
 
diff --git a/mod/forum/report/summary/templates/bulk_action_menu.mustache b/mod/forum/report/summary/templates/bulk_action_menu.mustache
index cf4087abde6..5a999f814fe 100644
--- a/mod/forum/report/summary/templates/bulk_action_menu.mustache
+++ b/mod/forum/report/summary/templates/bulk_action_menu.mustache
@@ -67,7 +67,7 @@
 <br />
 <div class="d-inline-block w-100">
     {{#showbulkactions}}
-    <div class="buttons float-left">
+    <div class="buttons float-start">
         <div class="d-flex flex-wrap align-items-center ps-1">
             <label for="{{id}}">{{#str}}withselectedusers{{/str}}</label>
             <select id="{{id}}" class="select custom-select ms-4" {{#attributes}}{{name}}="{{value}}" {{/attributes}}>
@@ -79,7 +79,7 @@
         </div>
     </div>
     {{/showbulkactions}}
-    <div class="float-right">
+    <div class="float-end">
         {{#perpage}}
             {{> core/single_select}}
         {{/perpage}}
diff --git a/mod/forum/report/summary/templates/filter_dates_popover.mustache b/mod/forum/report/summary/templates/filter_dates_popover.mustache
index 469e0e8493e..3e5277db0ba 100644
--- a/mod/forum/report/summary/templates/filter_dates_popover.mustache
+++ b/mod/forum/report/summary/templates/filter_dates_popover.mustache
@@ -29,11 +29,11 @@
     <h3 class="popover-header">{{# str}} filter:datesname, forumreport_summary {{/ str}}</h3>
     <div class="popover-body" data-region="filter-dates">
         {{{filterdatesform}}}
-        <div id="dates-filter-warning" class="form-control-feedback text-danger hidden float-right">
+        <div id="dates-filter-warning" class="form-control-feedback text-danger hidden float-end">
             {{# str}} filter:datesorderwarning, forumreport_summary {{/ str}}
         </div>
         <br>&nbsp;
-        <button type="button" class="filter-save float-right btn btn-link p-0" aria-label="{{# str}} save {{/ str}}">
+        <button type="button" class="filter-save float-end btn btn-link p-0" aria-label="{{# str}} save {{/ str}}">
             <strong>{{# str}} save {{/ str}}</strong>
         </button>
     </div>
diff --git a/mod/forum/report/summary/templates/filter_groups.mustache b/mod/forum/report/summary/templates/filter_groups.mustache
index 4d580843295..cc20d4a20fa 100644
--- a/mod/forum/report/summary/templates/filter_groups.mustache
+++ b/mod/forum/report/summary/templates/filter_groups.mustache
@@ -66,7 +66,7 @@
         </div>
         <div class="filter-actions">
             <button type="button" class="select-all btn btn-link p-0 pe-1" aria-label="{{# str}} selectall {{/ str}}">{{# str}} selectall {{/ str}}</button>
-            <div class="float-right">
+            <div class="float-end">
                 <button type="button" class="filter-clear btn btn-link p-0 px-1" aria-label="{{# str}} clear {{/ str}}">{{# str}} clear {{/ str}}</button>
                 <button type="button" class="filter-save btn btn-link p-0" aria-label="{{# str}} save {{/ str}}">
                     <strong>{{# str}} save {{/ str}}</strong>
diff --git a/mod/forum/templates/forum_subscription_action.mustache b/mod/forum/templates/forum_subscription_action.mustache
index f7aaabe058b..25aae648b5a 100644
--- a/mod/forum/templates/forum_subscription_action.mustache
+++ b/mod/forum/templates/forum_subscription_action.mustache
@@ -27,7 +27,7 @@
     {
         "subscriptionoptions": {
             "formid": "selectsubscriptions",
-            "classes": "urlselect float-right",
+            "classes": "urlselect float-end",
             "disabled": false,
             "sesskey": "abcdef",
             "action": "http://localhost/course/jumpto.php",
diff --git a/mod/forum/templates/inpage_reply.mustache b/mod/forum/templates/inpage_reply.mustache
index 9734028179d..0f5199349d3 100644
--- a/mod/forum/templates/inpage_reply.mustache
+++ b/mod/forum/templates/inpage_reply.mustache
@@ -65,7 +65,7 @@
                     <label class="form-check-label" for="private-reply-checkbox-{{uniqid}}">{{#str}} privatereply, forum {{/str}}</label>
                 </div>
                 {{/canreplyprivately}}
-                <button data-action="forum-advanced-reply" class="btn btn-link float-right" type="submit">
+                <button data-action="forum-advanced-reply" class="btn btn-link float-end" type="submit">
                     {{#str}} advanced, core {{/str}}
                 </button>
             </div>
diff --git a/mod/glossary/editcategories.html b/mod/glossary/editcategories.html
index 52fd85111db..a755db494da 100644
--- a/mod/glossary/editcategories.html
+++ b/mod/glossary/editcategories.html
@@ -16,7 +16,7 @@
     </div>
     <div id="fitem_id_usedynalink" class="mb-3 row fitem">
         <div class="col-md-3">
-            <span class="float-sm-right text-nowrap">
+            <span class="float-sm-end text-nowrap">
                 <?php echo $OUTPUT->help_icon('linkcategory', 'glossary') ?>
             </span>
             <label class="col-form-label d-inline " for="usedynalink">
@@ -41,7 +41,7 @@
     </div>
     <div id="fgroup_id_buttonar" class="mb-3 row fitem femptylabel" data-groupname="buttonar">
         <div class="col-md-3">
-            <span class="float-sm-right text-nowrap">
+            <span class="float-sm-end text-nowrap">
             </span>
             <label class="col-form-label d-inline " for="fgroup_id_buttonar">
             </label>
diff --git a/mod/lti/templates/tool_card.mustache b/mod/lti/templates/tool_card.mustache
index c846ad1b7b9..51470a0d9ce 100644
--- a/mod/lti/templates/tool_card.mustache
+++ b/mod/lti/templates/tool_card.mustache
@@ -106,7 +106,7 @@
                             {{#state.unknown}}bg-warning text-dark{{/state.unknown}}">
                     {{state.text}}
                 </div>
-                <div class="tool-card-actions float-sm-right">
+                <div class="tool-card-actions float-sm-end">
                     {{#courseid}}
                         <a href="{{{urls.course}}}" title="{{#str}} courselink, mod_lti {{/str}}">{{#pix}} i/course, core, {{#str}} courselink, mod_lti {{/str}}{{/pix}}</a>
                     {{/courseid}}
diff --git a/mod/lti/templates/tool_proxy_card.mustache b/mod/lti/templates/tool_proxy_card.mustache
index 5a99f919497..acb047633e8 100644
--- a/mod/lti/templates/tool_proxy_card.mustache
+++ b/mod/lti/templates/tool_proxy_card.mustache
@@ -78,7 +78,7 @@
                             {{#state.unknown}}bg-warning text-dark{{/state.unknown}}">
                     {{state.text}}
                 </div>
-                <div class="tool-card-actions float-sm-right">
+                <div class="tool-card-actions float-sm-end">
                     {{#courseid}}
                         <a href="{{{urls.course}}}" title="{{#str}} courselink, mod_lti {{/str}}">{{#pix}} i/course, core, {{#str}} courselink, mod_lti {{/str}}{{/pix}}</a>
                     {{/courseid}}
diff --git a/mod/survey/templates/response_action_bar.mustache b/mod/survey/templates/response_action_bar.mustache
index 3dc6cd79da9..f0a7c7fd46c 100644
--- a/mod/survey/templates/response_action_bar.mustache
+++ b/mod/survey/templates/response_action_bar.mustache
@@ -65,7 +65,7 @@
         {{/urlselect}}
         {{#download}}
             <div class="navitem ms-sm-auto">
-                <a class="btn btn-secondary float-right" href="{{link}}">{{text}}</a>
+                <a class="btn btn-secondary float-end" href="{{link}}">{{text}}</a>
             </div>
         {{/download}}
     </div>
diff --git a/report/competency/templates/user_course_navigation.mustache b/report/competency/templates/user_course_navigation.mustache
index ede90c5a1bc..19c34245448 100644
--- a/report/competency/templates/user_course_navigation.mustache
+++ b/report/competency/templates/user_course_navigation.mustache
@@ -22,7 +22,7 @@
     Example context (json):
     { "hasusers": false, "hasmodules": false}
 }}
-<div class="float-right border p-2 mb-2">
+<div class="float-end border p-2 mb-2">
 <p>{{{groupselector}}}</p>
 <form class="user-competency-course-navigation">
 <input type="hidden" name="user" value="{{userid}}"/>
diff --git a/reportbuilder/templates/local/settings/sorting.mustache b/reportbuilder/templates/local/settings/sorting.mustache
index cf7c082a320..3f2f81bcbb2 100644
--- a/reportbuilder/templates/local/settings/sorting.mustache
+++ b/reportbuilder/templates/local/settings/sorting.mustache
@@ -52,7 +52,7 @@
                         data-column-sort-position="{{sortorder}}">
                         {{>core/drag_handle}}
                         {{#sorticon}}
-                            <span class="float-right">
+                            <span class="float-end">
                                 <button id="toggle-sort-direction-{{id}}"
                                         class="btn btn-link p-0"
                                         data-action="report-toggle-sort-direction"
diff --git a/theme/boost/scss/moodle/bs5-bridge.scss b/theme/boost/scss/moodle/bs5-bridge.scss
index c2f2c526f34..75d35b826a8 100644
--- a/theme/boost/scss/moodle/bs5-bridge.scss
+++ b/theme/boost/scss/moodle/bs5-bridge.scss
@@ -37,3 +37,15 @@
         @extend .mr#{$infix}-auto;
     }
 }
+
+// Generate all float classes for all breakpoints for directions start and end.
+// float-start > float-left, float-sm-end > float-sm-right, ...
+@each $breakpoint in map-keys($grid-breakpoints) {
+    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
+    .float#{$infix}-start {
+        @extend .float#{$infix}-left;
+    }
+    .float#{$infix}-end {
+        @extend .float#{$infix}-right;
+    }
+}
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 2bb620ebc92..d9711b8699b 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2432,15 +2432,6 @@ body.h5p-embed {
     z-index: 1 !important; /* stylelint-disable-line declaration-no-important */
 }
 
-// These floats are deprecated in Bootstrap 4.3.1. It is still okay to use them in Moodle.
-.float-left {
-    float: left !important; /* stylelint-disable-line declaration-no-important */
-}
-
-.float-right {
-    float: right !important; /* stylelint-disable-line declaration-no-important */
-}
-
 .img-responsive {
     @include img-fluid();
 }
diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss
index 035e6f55024..54d8661bdc9 100644
--- a/theme/boost/scss/moodle/course.scss
+++ b/theme/boost/scss/moodle/course.scss
@@ -807,11 +807,11 @@ span.editinstructions {
 
     .listitem {
         > div {
-            > .float-left {
+            > .float-start {
                 float: left;
             }
 
-            > .float-right {
+            > .float-end {
                 float: right;
                 text-align: right;
             }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 79718fee65e..efbc624bf0c 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -20313,11 +20313,11 @@ button.bg-dark:focus {
     align-self: stretch !important;
   }
 }
-.float-left {
+.float-left, .float-start {
   float: left !important;
 }
 
-.float-right {
+.float-right, .float-end {
   float: right !important;
 }
 
@@ -20326,10 +20326,10 @@ button.bg-dark:focus {
 }
 
 @media (min-width: 576px) {
-  .float-sm-left {
+  .float-sm-left, .float-sm-start {
     float: left !important;
   }
-  .float-sm-right {
+  .float-sm-right, .float-sm-end {
     float: right !important;
   }
   .float-sm-none {
@@ -20337,10 +20337,10 @@ button.bg-dark:focus {
   }
 }
 @media (min-width: 768px) {
-  .float-md-left {
+  .float-md-left, .float-md-start {
     float: left !important;
   }
-  .float-md-right {
+  .float-md-right, .float-md-end {
     float: right !important;
   }
   .float-md-none {
@@ -20348,10 +20348,10 @@ button.bg-dark:focus {
   }
 }
 @media (min-width: 992px) {
-  .float-lg-left {
+  .float-lg-left, .float-lg-start {
     float: left !important;
   }
-  .float-lg-right {
+  .float-lg-right, .float-lg-end {
     float: right !important;
   }
   .float-lg-none {
@@ -20359,10 +20359,10 @@ button.bg-dark:focus {
   }
 }
 @media (min-width: 1200px) {
-  .float-xl-left {
+  .float-xl-left, .float-xl-start {
     float: left !important;
   }
-  .float-xl-right {
+  .float-xl-right, .float-xl-end {
     float: right !important;
   }
   .float-xl-none {
@@ -25433,14 +25433,6 @@ body.h5p-embed .h5pmessages {
   z-index: 1 !important; /* stylelint-disable-line declaration-no-important */
 }
 
-.float-left {
-  float: left !important; /* stylelint-disable-line declaration-no-important */
-}
-
-.float-right {
-  float: right !important; /* stylelint-disable-line declaration-no-important */
-}
-
 .img-responsive {
   max-width: 100%;
   height: auto;
@@ -28737,10 +28729,10 @@ span.editinstructions .alert-link {
 #course-category-listings .item-actions .menu-action-text {
   vertical-align: inherit;
 }
-#course-category-listings .listitem > div > .float-left {
+#course-category-listings .listitem > div > .float-start {
   float: left;
 }
-#course-category-listings .listitem > div > .float-right {
+#course-category-listings .listitem > div > .float-end {
   float: right;
   text-align: right;
 }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index ece030460a6..eb2aaf75e31 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -20313,11 +20313,11 @@ button.bg-dark:focus {
     align-self: stretch !important;
   }
 }
-.float-left {
+.float-left, .float-start {
   float: left !important;
 }
 
-.float-right {
+.float-right, .float-end {
   float: right !important;
 }
 
@@ -20326,10 +20326,10 @@ button.bg-dark:focus {
 }
 
 @media (min-width: 576px) {
-  .float-sm-left {
+  .float-sm-left, .float-sm-start {
     float: left !important;
   }
-  .float-sm-right {
+  .float-sm-right, .float-sm-end {
     float: right !important;
   }
   .float-sm-none {
@@ -20337,10 +20337,10 @@ button.bg-dark:focus {
   }
 }
 @media (min-width: 768px) {
-  .float-md-left {
+  .float-md-left, .float-md-start {
     float: left !important;
   }
-  .float-md-right {
+  .float-md-right, .float-md-end {
     float: right !important;
   }
   .float-md-none {
@@ -20348,10 +20348,10 @@ button.bg-dark:focus {
   }
 }
 @media (min-width: 992px) {
-  .float-lg-left {
+  .float-lg-left, .float-lg-start {
     float: left !important;
   }
-  .float-lg-right {
+  .float-lg-right, .float-lg-end {
     float: right !important;
   }
   .float-lg-none {
@@ -20359,10 +20359,10 @@ button.bg-dark:focus {
   }
 }
 @media (min-width: 1200px) {
-  .float-xl-left {
+  .float-xl-left, .float-xl-start {
     float: left !important;
   }
-  .float-xl-right {
+  .float-xl-right, .float-xl-end {
     float: right !important;
   }
   .float-xl-none {
@@ -25433,14 +25433,6 @@ body.h5p-embed .h5pmessages {
   z-index: 1 !important; /* stylelint-disable-line declaration-no-important */
 }
 
-.float-left {
-  float: left !important; /* stylelint-disable-line declaration-no-important */
-}
-
-.float-right {
-  float: right !important; /* stylelint-disable-line declaration-no-important */
-}
-
 .img-responsive {
   max-width: 100%;
   height: auto;
@@ -28737,10 +28729,10 @@ span.editinstructions .alert-link {
 #course-category-listings .item-actions .menu-action-text {
   vertical-align: inherit;
 }
-#course-category-listings .listitem > div > .float-left {
+#course-category-listings .listitem > div > .float-start {
   float: left;
 }
-#course-category-listings .listitem > div > .float-right {
+#course-category-listings .listitem > div > .float-end {
   float: right;
   text-align: right;
 }
diff --git a/user/profile/index.php b/user/profile/index.php
index bc2665a74e9..a43de9cafc3 100644
--- a/user/profile/index.php
+++ b/user/profile/index.php
@@ -142,7 +142,7 @@ foreach ($categories as $category) {
                 'data-datatypename' => $fieldname]);
         $menu->add($action);
     }
-    $menu->attributes['class'] .= ' float-left me-1';
+    $menu->attributes['class'] .= ' float-start me-1';
 
     // Add category information to the template.
     $outputcategories[] = [
diff --git a/user/templates/edit_profile_fields.mustache b/user/templates/edit_profile_fields.mustache
index 97faa9e4b8b..a3620586cd3 100644
--- a/user/templates/edit_profile_fields.mustache
+++ b/user/templates/edit_profile_fields.mustache
@@ -53,7 +53,7 @@
 
 <div class="row profileeditor">
     <div class="col align-self-end">
-        <a tabindex="0" role="button" class="btn btn-secondary float-right" data-action="editcategory">{{#str}}profilecreatecategory, admin{{/str}}</a>
+        <a tabindex="0" role="button" class="btn btn-secondary float-end" data-action="editcategory">{{#str}}profilecreatecategory, admin{{/str}}</a>
     </div>
 </div>