diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47206fcbbe..89c3eaea22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Breaking
+
+- [#2486: Move header and footer blocks out of govuk-branded into main](https://github.com/alphagov/govuk-prototype-kit/pull/2486)
+
 ## 13.18.1
 
 ### Fixes
diff --git a/__tests__/spec/migrate.js b/__tests__/spec/migrate.js
index 634b314b30..eb6af4f3e0 100644
--- a/__tests__/spec/migrate.js
+++ b/__tests__/spec/migrate.js
@@ -177,10 +177,22 @@ https://prototype-kit.service.gov.uk/docs/how-to-use-layouts
 
 {% block header %}
 
-    {{ govukHeader() }}
-    {{ govukServiceNavigation({
-        serviceName: serviceName
-    })}}
+  {{ govukHeader() }}
+  {{ govukServiceNavigation({
+    serviceName: serviceName,
+    serviceUrl: "/"
+  })}}
+
+{% endblock %}
+
+{% block footer %}
+
+  {{ govukFooter({
+    meta: {
+      items: footerItems,
+      visuallyHiddenTitle: "Footer links"
+    }
+  }) }}
 
 {% endblock %}
 `
diff --git a/lib/nunjucks/govuk-prototype-kit/layouts/govuk-branded.njk b/lib/nunjucks/govuk-prototype-kit/layouts/govuk-branded.njk
index 8a089ce5ce..2800b2ffaf 100644
--- a/lib/nunjucks/govuk-prototype-kit/layouts/govuk-branded.njk
+++ b/lib/nunjucks/govuk-prototype-kit/layouts/govuk-branded.njk
@@ -2,27 +2,7 @@
 
 {% extends "govuk/template.njk" %}
 
-{% block head %}
-  {% block meta %}{% endblock %}
-  {% block stylesheets %}
-    {% include "govuk-prototype-kit/includes/stylesheets.njk" %}
-  {% endblock %}
-{% endblock %}
-
-{% block pageTitle %}
-  {% if pageName %}{{ pageName }} - {% endif %}{{ serviceName }} - GOV.UK
-{% endblock %}
-
-{% block header %}
-  {{ govukHeader({
-    homepageUrl: "/",
-    serviceName: serviceName,
-    serviceUrl: "/",
-    containerClasses: "govuk-width-container"
-  }) }}
-{% endblock %}
-
-{% if (GOVUKPrototypeKit.isDevelopment) %}
+{%- if (GOVUKPrototypeKit.isDevelopment) %}
   {% set footerItems = [
     {
       href: "/manage-prototype",
@@ -39,15 +19,17 @@
       text: "Clear data"
     }
   ] %}
-{% endif %}
+{% endif -%}
 
-{% block footer %}
-  {{ govukFooter({
-    meta: {
-      items: footerItems,
-      visuallyHiddenTitle: "Footer links"
-    }
-  }) }}
+{% block head %}
+  {% block meta %}{% endblock %}
+  {% block stylesheets %}
+    {% include "govuk-prototype-kit/includes/stylesheets.njk" %}
+  {% endblock %}
+{% endblock %}
+
+{% block pageTitle %}
+  {% if pageName %}{{ pageName }} - {% endif %}{{ serviceName }} - GOV.UK
 {% endblock %}
 
 {% block bodyEnd %}
diff --git a/prototype-starter/app/views/layouts/main.html b/prototype-starter/app/views/layouts/main.html
index abb25592b7..530ee65cd8 100644
--- a/prototype-starter/app/views/layouts/main.html
+++ b/prototype-starter/app/views/layouts/main.html
@@ -8,9 +8,21 @@
 
 {% block header %}
 
-    {{ govukHeader() }}
-    {{ govukServiceNavigation({
-        serviceName: serviceName
-    })}}
+  {{ govukHeader() }}
+  {{ govukServiceNavigation({
+    serviceName: serviceName,
+    serviceUrl: "/"
+  })}}
+
+{% endblock %}
+
+{% block footer %}
+
+  {{ govukFooter({
+    meta: {
+      items: footerItems,
+      visuallyHiddenTitle: "Footer links"
+    }
+  }) }}
 
 {% endblock %}