diff --git a/course/classes/output/bulk_activity_completion_renderer.php b/course/classes/output/bulk_activity_completion_renderer.php
index 1d4cd87c729..b7140aa1e8e 100644
--- a/course/classes/output/bulk_activity_completion_renderer.php
+++ b/course/classes/output/bulk_activity_completion_renderer.php
@@ -62,6 +62,7 @@ class core_course_bulk_activity_completion_renderer extends plugin_renderer_base
             if ($module->canmanage) {
                 // Only create the form if it's different from the one that has been sent.
                 $modform = $form;
+                $module->open = true;
                 if (empty($form) || !in_array($module->id, array_keys($modules))) {
                     $modform = new \core_completion_defaultedit_form(
                         null,
@@ -74,7 +75,7 @@ class core_course_bulk_activity_completion_renderer extends plugin_renderer_base
                             'forceuniqueid' => true,
                         ],
                     );
-                    $module->modulecollapsed = true;
+                    $module->open = false;
                 }
 
                 $moduleform = manager::get_module_form($module->name, $course);
diff --git a/course/classes/output/completion_action_bar.php b/course/classes/output/completion_action_bar.php
index 4d34419a8f9..97c00e38552 100644
--- a/course/classes/output/completion_action_bar.php
+++ b/course/classes/output/completion_action_bar.php
@@ -70,6 +70,7 @@ class completion_action_bar implements templatable, renderable {
 
         return [
             'navigation' => $selectmenu->export_for_template($output),
+            'headinglevel' => 2,
         ];
     }
 }
diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache
index 2c4f05110ed..f2cf383b358 100644
--- a/course/templates/defaultactivitycompletion.mustache
+++ b/course/templates/defaultactivitycompletion.mustache
@@ -42,46 +42,32 @@
             {{#issite}}{{#str}}defaultactivitycompletionsite, core_completion{{/str}}{{/issite}}
             {{^issite}}{{#str}}defaultactivitycompletioncourse, core_completion{{/str}}{{/issite}}
         </div>
-
     </div>
-
     <div class="modules pt-3">
         {{#modules}}
             {{#canmanage}}
-                <div class="defaultactivitycompletion-item d-flex"
-                    id="activitycompletion-{{id}}"
-                >
-                    <a data-toggle="collapse"
-                        href="#activitycompletioncollapse-{{id}}"
-                        class="icons-collapse-expand {{#modulecollapsed}}collapsed{{/modulecollapsed}}"
-                        aria-expanded="{{^modulecollapsed}}true{{/modulecollapsed}}{{#modulecollapsed}}false{{/modulecollapsed}}"
-                        role="button"
-                    >
-                        <span class="collapsed-icon icon-no-margin me-1"
-                            title="{{#str}} expandcategory, core, {{formattedname}} {{/str}}">
-                            <span class="dir-rtl-hide">{{#pix}} t/collapsedchevron, core {{/pix}}</span>
-                            <span class="dir-ltr-hide">{{#pix}} t/collapsedchevron_rtl, core {{/pix}}</span>
-                            <span class="visually-hidden">{{#str}} expandcategory, core, {{formattedname}} {{/str}}</span>
-                        </span>
-                        <span class="expanded-icon icon-no-margin me-1"
-                            title="{{#str}} collapsecategory, core, {{formattedname}} {{/str}}">
-                            {{#pix}} t/expandedchevron, core {{/pix}}
-                            <span class="visually-hidden">{{#str}} collapsecategory, core, {{formatedname}} {{/str}}</span>
-                        </span>
-                        <img class="activityicon ms-4" src="{{icon}}" alt="" aria-hidden="true">
-                        <h2 class="activityname ms-3 mb-0">{{{formattedname}}}</h2>
-                    </a>
-                </div>
-                <div id="activitycompletioncollapse-{{id}}"
-                    class="defaultactivitycompletion-item-content collapse multi-collapse {{^modulecollapsed}}show{{/modulecollapsed}}"
-                    aria-labelledby="activitycompletion-{{id}}" role="group"
+            {{<core/local/collapsable_section}}
+                {{$titlecontent}}
+                    <img class="activityicon ms-2" src="{{icon}}" alt="" aria-hidden="true">
+                    <span class="activityname ms-3 mb-0">{{{formattedname}}}</span>
+                {{/titlecontent}}
+                {{$elementid}}activitycompletioncollapse-{{id}}{{/elementid}}
+                {{$extraclasses}}defaultactivitycompletion-item{{/extraclasses}}
+                {{$expandlabel}}
+                    {{#str}} expandcategory, core, {{formattedname}} {{/str}}
+                {{/expandlabel}}
+                {{$collapselabel}}
+                    {{#str}} collapsecategory, core, {{formattedname}} {{/str}}
+                {{/collapselabel}}
+                {{$extras}}
                     data-region="activitycompletion-{{name}}"
-                >
+                {{/extras}}
+                {{$sectioncontent}}
                     <hr class="row">
                     <div class="py-3">{{{formhtml}}}</div>
-                </div>
-
-                <hr class="row">
+                {{/sectioncontent}}
+            {{/core/local/collapsable_section}}
+            <hr class="row">
             {{/canmanage}}
         {{/modules}}
     </div>