diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
similarity index 82%
rename from .github/ISSUE_TEMPLATE/bug_report.yaml
rename to .github/ISSUE_TEMPLATE/bug-report.yaml
index 14263c5d70..9c9e295550 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -1,7 +1,8 @@
 name: Bug Report
 description: File a bug report
 title: "[Bug]: "
-labels: ["bug", "triage"]
+labels: ["Bug", "Triage"]
+projects: ["ONS Design System project", "ONS Design Team community backlog"]
 assignees: []
 body:
   - type: markdown
@@ -47,14 +48,15 @@ body:
       placeholder: For example, 32.2.7
     validations:
       required: true
-  - type: checkboxes
+  - type: dropdown
     id: device
     attributes:
       label: What devices are you seeing the problem on?
       options:
-        - label: Desktop
-        - label: Mobile
-        - label: Tablet
+        - Desktop
+        - Mobile
+        - Tablet
+      multiple: true
   - type: input
     id: device-details
     attributes:
@@ -62,16 +64,17 @@ body:
       description: Here you can provide further information about the device(s) that are affected by this bug or issue.
     validations:
       required: false
-  - type: checkboxes
+  - type: dropdown
     id: operating-system
     attributes:
       label: What operating systems are you seeing the problem on?
       options:
-        - label: Windows
-        - label: macOS
-        - label: Android
-        - label: iOS
-        - label: Other
+        - Windows
+        - macOS
+        - Android
+        - iOS
+        - Other
+      multiple: true
   - type: input
     id: operating-system-details
     attributes:
@@ -79,17 +82,18 @@ body:
       description: Here you can provide further information about the operating system(s) that are affected by this bug or issue.
     validations:
       required: false
-  - type: checkboxes
+  - type: dropdown
     id: browsers
     attributes:
       label: What browsers are you seeing the problem on?
       options:
-        - label: Firefox
-        - label: Chrome
-        - label: Safari
-        - label: Microsoft Edge
-        - label: Microsoft Internet Explorer
-        - label: Other
+        - Firefox
+        - Chrome
+        - Safari
+        - Microsoft Edge
+        - Microsoft Internet Explorer
+        - Other
+      multiple: true
   - type: input
     id: browsers-details
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature-request.yaml
similarity index 87%
rename from .github/ISSUE_TEMPLATE/feature_request.yaml
rename to .github/ISSUE_TEMPLATE/feature-request.yaml
index 09dea61e6d..8fdeaad730 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yaml
@@ -1,14 +1,15 @@
 name: New feature proposal
 description: Propose a new component, pattern, foundation or documentation to add to the ONS Design System
 title: "[Feature]: "
-labels: ["New feature proposal", "triage"]
+labels: ["New feature proposal", "Triage"]
+projects: ["ONS Design System project", "ONS Design Team community backlog"]
 assignees: []
 body:
   - type: markdown
     attributes:
       value: |
         **Before you fill in this proposal template:**
-        - If you are suggesting a change to a component, pattern or foundation that is already in the ONS Design System, please comment on its [GitHub discussion instead] (https://github.com/ONSdigital/design-system/discussions). You can get to the discussion using the direct link at the bottom of each page in the Design System.
+        - If you are suggesting a change to a component, pattern or foundation that is already in the ONS Design System, please comment on its [GitHub discussion instead](https://github.com/ONSdigital/design-system/discussions). You can get to the discussion using the direct link at the bottom of each page in the Design System.
         - If you are proposing something new, check the [ONS Design System community backlog](https://github.com/ONSdigital/design-system/projects/1) first. There may already be a proposal for something similar. You can add examples of your own evidence to an existing proposal.
   - type: textarea
     id: what
diff --git a/__snapshots__/layout/_template.spec.js.snap b/__snapshots__/layout/_template.spec.js.snap
index d5f13bc34a..180cd7df5a 100644
--- a/__snapshots__/layout/_template.spec.js.snap
+++ b/__snapshots__/layout/_template.spec.js.snap
@@ -785,7 +785,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `
                                 <div class="ons-grid__col ons-col-auto ons-u-d-no@xxs@m">
                                     <nav class="ons-header-service-nav ons-header-service-nav--main " aria-label="Services menu">
                                         <ul class="ons-header-service-nav__list">
-                                                                                            
+                                            
                                                 <li class="ons-header-service-nav__item">
                                                 
                                                     
@@ -805,7 +805,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `
                                                     Jacky Turner
                                                 
                                                 </li>
-                                                                                            
+                                            
                                                 <li class="ons-header-service-nav__item">
                                                 
                                                 
@@ -875,7 +875,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `
             
                 <nav class="ons-header-service-nav ons-header-service-nav--mobile ons-u-d-no ons-js-services-mobile-nav" id="service-links" aria-label="Services menu">
                     <ul class="ons-header-service-nav__list">
-                                                                        
+                        
                             <li class="ons-header-service-nav__item ons-header-service-nav__item--mobile">
                             
                                 
@@ -895,7 +895,7 @@ exports[`base page template matches the full configuration snapshot 1`] = `
                                 Jacky Turner
                             
                             </li>
-                                                                        
+                        
                             <li class="ons-header-service-nav__item ons-header-service-nav__item--mobile">
                             
                             
diff --git a/src/components/autosuggest/_macro.spec.js b/src/components/autosuggest/_macro.spec.js
index 37b2d0ee13..75910bf9af 100644
--- a/src/components/autosuggest/_macro.spec.js
+++ b/src/components/autosuggest/_macro.spec.js
@@ -264,11 +264,7 @@ describe('macro: autosuggest', () => {
     it('renders div with the provided title text', () => {
       const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
 
-      expect(
-        $('.ons-autosuggest__results-title')
-          .text()
-          .trim(),
-      ).toBe('Suggestions');
+      expect($('.ons-autosuggest__results-title').text().trim()).toBe('Suggestions');
     });
 
     it('renders list with a generated identifier', () => {
@@ -298,11 +294,7 @@ describe('macro: autosuggest', () => {
     it('renders instructions text', () => {
       const $ = cheerio.load(renderComponent('autosuggest', EXAMPLE_AUTOSUGGEST));
 
-      expect(
-        $('.ons-autosuggest__instructions')
-          .text()
-          .trim(),
-      ).toBe('Use up and down keys to navigate.');
+      expect($('.ons-autosuggest__instructions').text().trim()).toBe('Use up and down keys to navigate.');
     });
   });
 });
diff --git a/src/components/header/_macro.njk b/src/components/header/_macro.njk
index 815a7091d1..d3dcff87e4 100644
--- a/src/components/header/_macro.njk
+++ b/src/components/header/_macro.njk
@@ -88,7 +88,7 @@
                                 <div class="ons-grid__col ons-col-auto{% if controlVisibility == true %} ons-u-d-no@xxs@{{ breakpoint }}{% endif %}">
                                     <nav class="ons-header-service-nav ons-header-service-nav--main {{ params.serviceLinks.classes }}" aria-label="{{ params.serviceLinks.ariaLabel | default("Service links navigation") }}">
                                         <ul class="ons-header-service-nav__list">
-                                            {% for item in params.serviceLinks.itemsList %}                                                
+                                            {% for item in params.serviceLinks.itemsList %}
                                                 <li class="ons-header-service-nav__item">
                                                 {% if item.iconType %}
                                                     {{
@@ -139,7 +139,7 @@
             {% if params.serviceLinks %}
                 <nav class="ons-header-service-nav ons-header-service-nav--mobile ons-u-d-no ons-js-services-mobile-nav" id="{{ params.serviceLinks.id }}" aria-label="{{ params.serviceLinks.ariaLabel | default("Service links navigation") }}">
                     <ul class="ons-header-service-nav__list">
-                        {% for item in params.serviceLinks.itemsList %}                                                
+                        {% for item in params.serviceLinks.itemsList %}
                             <li class="ons-header-service-nav__item ons-header-service-nav__item--mobile">
                             {% if item.iconType %}
                                 {{