diff --git a/app/components/header/header-logo.njk b/app/components/header/header-logo.njk
index 800210b56..aa44f63fd 100644
--- a/app/components/header/header-logo.njk
+++ b/app/components/header/header-logo.njk
@@ -5,10 +5,6 @@
 
 {% block body %}
 
-  {{ header({
-      "showNav": "false",
-      "showSearch": "false"
-    })
-  }}
+  {{ header() }}
 
 {% endblock %}
diff --git a/app/components/header/header-navigation.njk b/app/components/header/header-navigation.njk
index 79ff95761..a628b91af 100644
--- a/app/components/header/header-navigation.njk
+++ b/app/components/header/header-navigation.njk
@@ -6,39 +6,36 @@
 {% block body %}
 
   {{ header({
-      "showNav": "true",
-      "showSearch": "false",
-      "primaryLinks": [
-        {
-          "url"  : "https://www.nhs.uk/conditions",
-          "label" : "Health A-Z",
-          "classes": "app-header__navigation-item--current",
-          "attributes": {
-            "aria-current": "true"
-          }
-        },
-        {
-          'url' : 'https://www.nhs.uk/live-well/',
-          'label' : 'Live Well'
-        },
-        {
-          'url' : 'https://www.nhs.uk/mental-health/',
-          'label' : 'Mental health'
-        },
-        {
-          'url'  : 'https://www.nhs.uk/conditions/social-care-and-support/',
-          'label' : 'Care and support'
-        },
-        {
-          'url'  : 'https://www.nhs.uk/pregnancy/',
-          'label' : 'Pregnancy'
-        },
-        {
-          'url' : 'https://www.nhs.uk/nhs-services/',
-          'label' : 'NHS services'
+    "primaryLinks": [
+      {
+        "url"  : "https://www.nhs.uk/conditions",
+        "label" : "Health A-Z",
+        "classes": "app-header__navigation-item--current",
+        "attributes": {
+          "aria-current": "true"
         }
-      ]
-    })
-  }}
+      },
+      {
+        'url' : 'https://www.nhs.uk/live-well/',
+        'label' : 'Live Well'
+      },
+      {
+        'url' : 'https://www.nhs.uk/mental-health/',
+        'label' : 'Mental health'
+      },
+      {
+        'url'  : 'https://www.nhs.uk/conditions/social-care-and-support/',
+        'label' : 'Care and support'
+      },
+      {
+        'url'  : 'https://www.nhs.uk/pregnancy/',
+        'label' : 'Pregnancy'
+      },
+      {
+        'url' : 'https://www.nhs.uk/nhs-services/',
+        'label' : 'NHS services'
+      }
+    ]
+  }) }}
 
 {% endblock %}
diff --git a/app/components/header/header-org-white-nav.njk b/app/components/header/header-org-white-nav.njk
index c0d27af32..389605c8d 100644
--- a/app/components/header/header-org-white-nav.njk
+++ b/app/components/header/header-org-white-nav.njk
@@ -6,8 +6,6 @@
 {% block body %}
 
 {{ header({
-    "showNav": "true",
-    "showSearch": "true",
     "classes": "nhsuk-header--white nhsuk-header--white-nav",
     "organisation": {
       "name": "Anytown Anyplace",
@@ -35,7 +33,10 @@
         'url' : '#',
         'label' : 'Our research'
       }
-    ]
+    ],
+    "search": {
+      "label": "Search the Anytown Anyplace Anywhere website"
+    }
   })
 }}
 
diff --git a/app/components/header/header-org-white.njk b/app/components/header/header-org-white.njk
index 50c155ce0..980948b77 100644
--- a/app/components/header/header-org-white.njk
+++ b/app/components/header/header-org-white.njk
@@ -6,8 +6,6 @@
 {% block body %}
 
 {{ header({
-    "showNav": "true",
-    "showSearch": "true",
     "classes": "nhsuk-header--white",
     "organisation": {
       "name": "Anytown Anyplace",
@@ -35,7 +33,10 @@
         'url' : '#',
         'label' : 'Our research'
       }
-    ]
+    ],
+    "search": {
+      "label": "Search the Anytown Anyplace Anywhere website"
+    }
   })
 }}
 
diff --git a/app/components/header/header-org.njk b/app/components/header/header-org.njk
index 134cca172..0fb9d9ff3 100644
--- a/app/components/header/header-org.njk
+++ b/app/components/header/header-org.njk
@@ -6,8 +6,6 @@
 {% block body %}
 
 {{ header({
-    "showNav": "true",
-    "showSearch": "true",
     "organisation": {
       "name": "Anytown Anyplace",
       "split": "Anywhere",
@@ -34,7 +32,10 @@
         'url' : '#',
         'label' : 'Our research'
       }
-    ]
+    ],
+    "search": {
+      "label": "Search the Anytown Anyplace Anywhere website"
+    }
   })
 }}
 
diff --git a/app/components/header/header-search.njk b/app/components/header/header-search.njk
index 3eace51f0..bc8f026e2 100644
--- a/app/components/header/header-search.njk
+++ b/app/components/header/header-search.njk
@@ -6,35 +6,7 @@
 {% block body %}
 
   {{ header({
-      "showNav": "false",
-      "showSearch": "true",
-      "primaryLinks": [
-        {
-          "url"  : "https://www.nhs.uk/conditions",
-          "label" : "Health A-Z"
-        },
-        {
-          'url' : 'https://www.nhs.uk/live-well/',
-          'label' : 'Live Well'
-        },
-        {
-          'url' : 'https://www.nhs.uk/mental-health/',
-          'label' : 'Mental health'
-        },
-        {
-          'url'  : 'https://www.nhs.uk/conditions/social-care-and-support/',
-          'label' : 'Care and support'
-        },
-        {
-          'url'  : 'https://www.nhs.uk/pregnancy/',
-          'label' : 'Pregnancy'
-        },
-        {
-          'url' : 'https://www.nhs.uk/nhs-services/',
-          'label' : 'NHS services'
-        }
-      ]
-    })
-  }}
+    "search": "true"
+  }) }}
 
 {% endblock %}
diff --git a/app/components/header/header-service-name-with-nav.njk b/app/components/header/header-service-name-with-nav.njk
index d4680c3e6..a0c88e1d1 100644
--- a/app/components/header/header-service-name-with-nav.njk
+++ b/app/components/header/header-service-name-with-nav.njk
@@ -9,8 +9,9 @@
     "service": {
       "name": "Digital service manual"
     },
-    "showNav": "true",
-    "showSearch": "true",
+    "search": {
+      "label": "Search the NHS digital service manual"
+    },
     "primaryLinks": [
         {
           "url"  : "#",
diff --git a/app/components/header/header-service-name.njk b/app/components/header/header-service-name.njk
index 8c5149e50..a5c1a6559 100644
--- a/app/components/header/header-service-name.njk
+++ b/app/components/header/header-service-name.njk
@@ -6,10 +6,9 @@
 {% block body %}
 
   {{ header({
-      "service": {
-        "name": "Prototype kit"
-      }
-    })
-  }}
+    "service": {
+      "name": "Prototype kit"
+    }
+  }) }}
 
 {% endblock %}
diff --git a/app/components/header/header-transactional-service-name.njk b/app/components/header/header-transactional-service-name.njk
index 13038875d..ed53ebc4b 100644
--- a/app/components/header/header-transactional-service-name.njk
+++ b/app/components/header/header-transactional-service-name.njk
@@ -6,12 +6,9 @@
 {% block body %}
 
   {{ header({
-      "transactionalService": {
-        "name": "Find your NHS number"
-      },
-      "showNav": "false",
-      "showSearch": "false"
-    })
-  }}
+    "transactionalService": {
+      "name": "Find your NHS number"
+    }
+  }) }}
 
 {% endblock %}
diff --git a/packages/components/header/template.njk b/packages/components/header/template.njk
index b1ac41ade..004a901b0 100644
--- a/packages/components/header/template.njk
+++ b/packages/components/header/template.njk
@@ -1,167 +1,87 @@
-{# Define some defaults #}
-{% set showNav = params.showNav if params.showNav else "false" %}
-{% set showSearch = params.showSearch if params.showSearch else "false" %}
-
-{% set nhsLogo %}
-  <svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 16" height="40" width="100">
-    <path class="nhsuk-logo__background" fill="#005eb8" d="M0 0h40v16H0z"></path>
-    <path class="nhsuk-logo__text" fill="#fff" d="M3.9 1.5h4.4l2.6 9h.1l1.8-9h3.3l-2.8 13H9l-2.7-9h-.1l-1.8 9H1.1M17.3 1.5h3.6l-1 4.9h4L25 1.5h3.5l-2.7 13h-3.5l1.1-5.6h-4.1l-1.2 5.6h-3.4M37.7 4.4c-.7-.3-1.6-.6-2.9-.6-1.4 0-2.5.2-2.5 1.3 0 1.8 5.1 1.2 5.1 5.1 0 3.6-3.3 4.5-6.4 4.5-1.3 0-2.9-.3-4-.7l.8-2.7c.7.4 2.1.7 3.2.7s2.8-.2 2.8-1.5c0-2.1-5.1-1.3-5.1-5 0-3.4 2.9-4.4 5.8-4.4 1.6 0 3.1.2 4 .6"></path>
-  </svg>
-{% endset %}
+{%- set nhsLogo %}
+<svg class="nhsuk-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 16" height="40" width="100">
+  <path class="nhsuk-logo__background" fill="#005eb8" d="M0 0h40v16H0z"></path>
+  <path class="nhsuk-logo__text" fill="#fff" d="M3.9 1.5h4.4l2.6 9h.1l1.8-9h3.3l-2.8 13H9l-2.7-9h-.1l-1.8 9H1.1M17.3 1.5h3.6l-1 4.9h4L25 1.5h3.5l-2.7 13h-3.5l1.1-5.6h-4.1l-1.2 5.6h-3.4M37.7 4.4c-.7-.3-1.6-.6-2.9-.6-1.4 0-2.5.2-2.5 1.3 0 1.8 5.1 1.2 5.1 5.1 0 3.6-3.3 4.5-6.4 4.5-1.3 0-2.9-.3-4-.7l.8-2.7c.7.4 2.1.7 3.2.7s2.8-.2 2.8-1.5c0-2.1-5.1-1.3-5.1-5 0-3.4 2.9-4.4 5.8-4.4 1.6 0 3.1.2 4 .6"></path>
+</svg>
+{%- endset %}
 
 <header class="nhsuk-header
-{%- if params.transactional or params.transactionalService %} nhsuk-header__transactional{% endif %}
-{%- if params.organisation and params.organisation.name %} nhsuk-header--organisation{% endif %}
+{%- if params.transactionalService %} nhsuk-header__transactional{% endif %}
+{%- if params.organisation %} nhsuk-header--organisation{% endif %}
 {%- if params.classes %} {{ params.classes }}{% endif %}" role="banner"
 {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
-  
   <div class="nhsuk-header__container">
-    <div class="nhsuk-header__logo 
-    {%- if showNav == "false" and showSearch == "false" and params.transactionalService %} nhsuk-header__transactional--logo{% endif %}
-    {%- if showNav == "false" and showSearch == "false" and not params.transactionalService %} nhsuk-header__logo--only{% endif %}">
-      {%- if params.organisation %}
-      <a class="nhsuk-header__link" href="{% if params.homeHref %}{{ params.homeHref }}{% else %}/{% endif %}" aria-label="{{ params.organisation.name }} {{ params.organisation.split }} {{ params.organisation.descriptor }} homepage">
-        {%- if params.organisation.logoURL %}
+    <div class="nhsuk-header__logo
+    {%- if not params.primaryLinks and not params.search and params.transactionalService %} nhsuk-header__transactional--logo{% endif %}
+    {%- if not params.primaryLinks and not params.search and not params.transactionalService %} nhsuk-header__logo--only{% endif %}">
+    {%- if params.organisation %}
+      <a class="nhsuk-header__link" href="{{ params.homeHref | default('/') }}" aria-label="{{ params.organisation.name }} {{ params.organisation.split }} {{ params.organisation.descriptor }} homepage">
+      {%- if params.organisation.logoURL %}
         <img class="nhsuk-organisation-logo" src="{{ baseUrl }}{{ params.organisation.logoURL }}" alt=""/>
-        {%- else -%}
+      {%- else -%}
         {{ nhsLogo | safe }}
         <span class="nhsuk-organisation-name">{{ params.organisation.name }}{% if params.organisation.split %} <span class="nhsuk-organisation-name-split">{{ params.organisation.split }}</span>{% endif %}</span>
         {% if params.organisation.descriptor %}<span class="nhsuk-organisation-descriptor">{{ params.organisation.descriptor }}</span>{% endif %}
-        {%- endif %}
+      {%- endif %}
       </a>
-      {%- else -%}
-      <a class="nhsuk-header__link{% if params.service %} nhsuk-header__link--service {% endif %}" href="{% if params.homeHref %}{{ params.homeHref }}{% else %}/{% endif %}" aria-label="{% if params.ariaLabel %}{{ params.ariaLabel }}{% else %}NHS homepage{% endif %}">
+    {%- else -%}
+      <a class="nhsuk-header__link{% if params.service %} nhsuk-header__link--service {% endif %}" href="{{ params.homeHref | default('/') }}" aria-label="{{ params.ariaLabel | default('NHS homepage') }}">
         {{ nhsLogo | safe }}
         {%- if params.service %}
-        <span class="nhsuk-header__service-name">
-          {{ params.service.name }}
-        </span>
+        <span class="nhsuk-header__service-name">{{ params.service.name }}</span>
         {%- endif %}
       </a>
-      {%- endif %}
+    {%- endif %}
     </div>
-    
-
-    {%- if showNav == "false" and showSearch == "false"%}
-
-      {%- if params.transactionalService%}
-        <div class="nhsuk-header__transactional-service-name">
-          <a class="nhsuk-header__transactional-service-name--link" href="{% if params.transactionalService.href %}{{ params.transactionalService.href }}{% else %}/{% endif %}">{{ params.transactionalService.name }}</a>
-        </div>
-        
-      {%- endif %}
-
-    </div>{# close nhsuk-header__container #}
-    
-
-    {% endif -%}
-
-    {% if showNav == "true" and params.primaryLinks and showSearch == "true" %}
-
-      <div class="nhsuk-header__content" id="content-header">
-        <div class="nhsuk-header__search">
-            <div class="nhsuk-header__search-wrap" id="wrap-search">
-              <form class="nhsuk-header__search-form" id="search" action="{{ params.searchAction if params.searchAction else 'https://www.nhs.uk/search/' }}" method="get" role="search">
-                <label class="nhsuk-u-visually-hidden" for="search-field">Search the NHS website</label>
-                <input class="nhsuk-search__input" id="search-field" name="{{ params.searchInputName if params.searchInputName else "search-field" }}" type="search" placeholder="Search" autocomplete="off" >
-                <button class="nhsuk-search__submit" type="submit">
-                  <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-                    <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
-                  </svg>
-                  <span class="nhsuk-u-visually-hidden">Search</span>
-                </button>
-              </form>
-            </div>
-          </div>
-      </div>
 
-    </div>{# close nhsuk-header__container #}
-    <div class="nhsuk-navigation-container">
-      <nav class="nhsuk-navigation" id="header-navigation" role="navigation" aria-label="Primary navigation">
-        <ul class="nhsuk-header__navigation-list {%- if params.primaryLinks.length < 4 %} nhsuk-header__navigation-list--left-aligned{% endif %}">
-          {%- for item in params.primaryLinks %}
-          <li class="nhsuk-header__navigation-item {%- if item.classes %} {{ item.classes }}{% endif %}" {%- for attribute, value in item.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
-            <a class="nhsuk-header__navigation-link"  href="{{item.url}}">
-              {{item.label}}
-            </a>
-          </li>
-          {%- endfor %}
-          <li class="nhsuk-header__navigation-item nhsuk-header__navigation-item--home">
-            <a class="nhsuk-header__navigation-link"  href="/">
-              Home
-            </a>
-          </li>
-          <li class="nhsuk-mobile-menu-container">
-            <button class="nhsuk-header__menu-toggle nhsuk-header__navigation-link" id="toggle-menu" aria-expanded="false">
-              <span class="nhsuk-u-visually-hidden">Browse</span>
-              More
-              <svg class="nhsuk-icon nhsuk-icon__chevron-down" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-                <path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
-              </svg>
-            </button>
-          </li>
-        </ul>
-      </nav>
+{%- if params.transactionalService and not params.primaryLinks and not params.search %}
+    <div class="nhsuk-header__transactional-service-name">
+      <a class="nhsuk-header__transactional-service-name--link" href="{{ params.transactionalService.href | default('/') }}">{{ params.transactionalService.name }}</a>
     </div>
-
-
-    {% endif -%}
-
-    {% if showSearch == "true" and showNav == "false" %}
-
-      <div class="nhsuk-header__content" id="content-header">
-        <div class="nhsuk-header__search nhsuk-header__search-no-nav">
-            <div class="nhsuk-header__search-wrap js-show" id="wrap-search">
-              <form class="nhsuk-header__search-form" id="search" action="{{ params.searchAction if params.searchAction else 'https://www.nhs.uk/search/' }}" method="get" role="search">
-                <label class="nhsuk-u-visually-hidden" for="search-field">Search the NHS website</label>
-                <input class="nhsuk-search__input" id="search-field" name="{{ params.searchInputName if params.searchInputName else "search-field" }}" type="search" placeholder="Search" autocomplete="off" >
-                <button class="nhsuk-search__submit" type="submit">
-                  <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-                    <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
-                  </svg>
-                  <span class="nhsuk-u-visually-hidden">Search</span>
-                </button>
-              </form>
-            </div>
-          </div>
-      </div>
-
-    </div>{# close nhsuk-header__container #}
-
-    {% endif -%}
-
-    {% if showNav == "true" and params.primaryLinks and showSearch == "false" %}
-
-    </div>{# close nhsuk-header__container #}
-    
-    <div class="nhsuk-navigation-container">
-      <nav class="nhsuk-navigation" id="header-navigation" role="navigation" aria-label="Primary navigation">
-        <ul class="nhsuk-header__navigation-list {%- if params.primaryLinks.length < 4 %} nhsuk-header__navigation-list--left-aligned{% endif %}">
-          {%- for item in params.primaryLinks %}
-          <li class="nhsuk-header__navigation-item {%- if item.classes %} {{ item.classes }}{% endif %}" {%- for attribute, value in item.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
-            <a class="nhsuk-header__navigation-link"  href="{{item.url}}">
-              {{item.label}}
-            </a>
-          </li>
-          {%- endfor %}
-          <li class="nhsuk-header__navigation-item nhsuk-header__navigation-item--home">
-            <a class="nhsuk-header__navigation-link"  href="/">
-              Home
-            </a>
-          </li>
-          <li class="nhsuk-mobile-menu-container">
-            <button class="nhsuk-header__menu-toggle nhsuk-header__navigation-link" id="toggle-menu" aria-expanded="false">
-              <span class="nhsuk-u-visually-hidden">Browse</span>
-              More
-              <svg class="nhsuk-icon nhsuk-icon__chevron-down" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-                <path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
+{%- endif %}
+
+{%- if params.search %}
+    <div class="nhsuk-header__content" id="content-header">
+      <div class="nhsuk-header__search {%- if not params.primaryLinks %} nhsuk-header__search-no-nav{% endif %}">
+        <div class="nhsuk-header__search-wrap" id="wrap-search">
+          <form class="nhsuk-header__search-form" id="search" action="{{ params.search.action | default('https://www.nhs.uk/search/') }}" method="get" role="search">
+            <label class="nhsuk-u-visually-hidden" for="search-field">{{ params.search.label | default('Search the NHS website') }}</label>
+            <input class="nhsuk-search__input" id="search-field" name="{{ params.search.name | default('search-field') }}" type="search" placeholder="Search" autocomplete="off">
+            <button class="nhsuk-search__submit" type="submit">
+              <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
               </svg>
+              <span class="nhsuk-u-visually-hidden">Search</span>
             </button>
-          </li>
-        </ul>
-      </nav>
+          </form>
+        </div>
+      </div>
     </div>
-
-    {% endif -%}
-
-</header>
\ No newline at end of file
+{%- endif %}
+  </div>
+
+{%- if params.primaryLinks %}
+  <div class="nhsuk-navigation-container">
+    <nav class="nhsuk-navigation" id="header-navigation" role="navigation" aria-label="Primary navigation">
+      <ul class="nhsuk-header__navigation-list {%- if params.primaryLinks.length < 4 %} nhsuk-header__navigation-list--left-aligned{% endif %}">
+      {%- for item in params.primaryLinks %}
+        <li class="nhsuk-header__navigation-item {%- if item.classes %} {{ item.classes }}{% endif %}" {%- for attribute, value in item.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+          <a class="nhsuk-header__navigation-link" href="{{ item.url }}">{{ item.label }}</a>
+        </li>
+      {%- endfor %}
+        <li class="nhsuk-header__navigation-item nhsuk-header__navigation-item--home">
+          <a class="nhsuk-header__navigation-link" href="/">Home</a>
+        </li>
+        <li class="nhsuk-mobile-menu-container">
+          <button class="nhsuk-header__menu-toggle nhsuk-header__navigation-link" id="toggle-menu" aria-expanded="false">
+            <span class="nhsuk-u-visually-hidden">Browse </span>More
+            <svg class="nhsuk-icon nhsuk-icon__chevron-down" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+              <path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
+            </svg>
+          </button>
+        </li>
+      </ul>
+    </nav>
+  </div>
+{%- endif %}
+</header>