diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2634621..227e677 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php: '7.4'
+          - php: '8.1'
             moodle-branch: 'master'
             database: 'pgsql'
           - php: '7.4'
@@ -23,7 +23,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:10
+        image: postgres:13
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -36,7 +36,7 @@ jobs:
           - 5432:5432
 
       mariadb:
-        image: mariadb:10.5
+        image: mariadb:10.6
         env:
           MYSQL_USER: 'root'
           MYSQL_ALLOW_EMPTY_PASSWORD: "true"
diff --git a/templates/category.mustache b/templates/category.mustache
index 65792f2..2a5e042 100644
--- a/templates/category.mustache
+++ b/templates/category.mustache
@@ -47,8 +47,10 @@
     }
 }}
 
+<h2>{{#str}}pluginname, report_customsql{{/str}}</h2>
+
 <div class="csql_category csql_category{{#expandable}}{{show}}{{/expandable}}">
-    <h2>
+    <h3>
         {{#expandable}}
             <a href="{{linkref}}" class="categoryname">{{name}}</a>
         {{/expandable}}
@@ -68,21 +70,21 @@
         {{#showonlythislink}}
             <a href="{{url}}" class="view-category">{{#str}}showonlythiscategory, report_customsql, {{name}}{{/str}}</a>
         {{/showonlythislink}}
-    </h2>
+    </h3>
     <div class="csql_category_reports">
         {{#querygroups}}
             {{#type}}
-                <h3>
+                <h4>
                     {{title}}
                     {{{helpicon}}}
-                </h3>
+                </h4>
             {{/type}}
             {{#queries}}
                 {{{categoryqueryitem}}}
             {{/queries}}
         {{/querygroups}}
         {{^querygroups}}
-            <h3>{{#str}}availablereports, report_customsql{{/str}}</h3>
+            <h4>{{#str}}availablereports, report_customsql{{/str}}</h4>
             <p>{{#str}}noreportsavailable, report_customsql{{/str}}</p>
         {{/querygroups}}
     </div>