diff --git a/templates/admin/base_admin.html.twig b/templates/admin/base_admin.html.twig
index b0f7124e..df510908 100644
--- a/templates/admin/base_admin.html.twig
+++ b/templates/admin/base_admin.html.twig
@@ -21,7 +21,7 @@
         {% endif %}
     {% endblock %}
 
-    {% form_theme form.log_comment 'bootstrap_4_layout.html.twig' %}
+    {% form_theme form.log_comment 'bootstrap_5_layout.html.twig' %}
 
     {% block card_content %}
         <div class="row">
diff --git a/templates/parts/edit/_orderdetails.html.twig b/templates/parts/edit/_orderdetails.html.twig
index 95f0dfef..f8d766d2 100644
--- a/templates/parts/edit/_orderdetails.html.twig
+++ b/templates/parts/edit/_orderdetails.html.twig
@@ -1,5 +1,5 @@
 {# Leave this template at bootstrap 4 for now, as it otherwise destroys our layout #}
-{% form_theme form.orderdetails with ['parts/edit/edit_form_styles.html.twig', "bootstrap_4_layout.html.twig"] %}
+{% form_theme form.orderdetails with ['parts/edit/edit_form_styles.html.twig', "bootstrap_5_layout.html.twig"] %}
 {% import 'components/collection_type.macro.html.twig' as collection %}
 
 <div {{ collection.controller(form.orderdetails, 'orderdetails.edit.delete.confirm') }}>