diff --git a/config.yaml b/config.yaml
index cae0fce7162e99c4cbbdb3b7e81cb61b771b8195..7e811742a064c69d1d9b3687966ad35d6f58bdd2 100644
--- a/config.yaml
+++ b/config.yaml
@@ -4,9 +4,30 @@ params:
     enable: false
     blank: true
     page: https://gdpr.eu/cookies/
+  plausible: false
+  seo:
+    title:
+      separator: "|"
+  logo:
+    header: "/assets/images/logo.svg"
+    footer: "/assets/images/logo.svg"
   breadcrumb:
     position: hero-start #  hero-start |  hero-end | after-hero | none
-  plausible: 
+  summary:
+    position: content # content | hero
+  home:
+    toc:
+      disabled: true
+  organizations:
+    dark_logo_background: false
+  pages:
+    index:
+      truncate_description: 200 # Set to 0 to disable truncate
+  partners:
+    map_marker_icon: '/assets/images/map-marker.svg'
+  persons:
+    index:
+      layout: list # grid | list
   posts:
     default_image: false
     date_format: ":date_long"
@@ -16,28 +37,9 @@ params:
       show_description: true
       truncate_description: 200 # Set to 0 to disable truncate
       layout: list # grid | list
-  pages:
-    index:
-      truncate_description: 200 # Set to 0 to disable truncate
-  partners:
-    map_marker_icon: '/assets/images/map-marker.svg'
-  persons:
-    index:
-      layout: list # grid | list
   programs:
     related_posts:
       quantity: 4
-  home:
-    toc:
-      disabled: true
-  logo:
-    header: "/assets/images/logo.svg"
-    footer: "/assets/images/logo.svg"
-  organizations:
-    dark_logo_background: false
-  seo:
-    title:
-      separator: "|"
   image_sizes:
     design_system:
       lightbox:
diff --git a/layouts/partials/commons/summary-wrapper.html b/layouts/partials/commons/summary-wrapper.html
index 7d2b45ff642d23b45513d8bceb0c01f01574628b..5432dbe8f9cfba79fdf392c7b5bb0f746f910eba 100644
--- a/layouts/partials/commons/summary-wrapper.html
+++ b/layouts/partials/commons/summary-wrapper.html
@@ -1,6 +1,5 @@
 {{ $summary := .summary | default (partial "PrepareText" .context.Params.summary) }}
-
-{{- if eq .site.Params.summary.position "content" -}}
+{{- if eq site.Params.summary.position "content" -}}
   {{- if .block_wrapped -}}
   <section class="block block-summary">
     <div class="container">
diff --git a/layouts/partials/header/hero.html b/layouts/partials/header/hero.html
index a172e9549c835fa03a760f73e6b2b4c81ccfcd63..024bf6481e1232235c120c6751b7da5509704bb2 100644
--- a/layouts/partials/header/hero.html
+++ b/layouts/partials/header/hero.html
@@ -1,9 +1,18 @@
 {{- $direction := "" -}}
 {{- $breadcrumb_is_after_hero := eq site.Params.breadcrumb.position "after-hero"  -}}
+{{- $subtitle := .subtitle -}}
 {{ if .image }}
   {{- $direction = partial "GetImageDirection" .image -}}
 {{ end }}
 
+{{- $summary := partial "PrepareText" .context.Params.summary -}}
+
+{{ if not $subtitle }}
+  {{ if and (eq site.Params.summary.position "hero") $summary }}
+   {{ $subtitle = $summary }}
+  {{ end }}
+{{ end }}
+
 <header class="hero {{ if .image -}}hero--with-image hero--image-{{- $direction -}}{{- end }} {{ if $breadcrumb_is_after_hero -}} hero--no-margin {{- end }}">
   <div class="container">
     {{- if eq site.Params.breadcrumb.position "hero-start" -}}
@@ -12,10 +21,10 @@
       {{- end -}}
     {{- end -}}
     <div class="content">
-      {{- if .subtitle -}}
+      {{- if $subtitle -}}
         <hgroup>
           <h1>{{ partial "PrepareHTML" .title }}</h1>
-          <p>{{ partial "PrepareHTML" .subtitle }}</p>
+          <p>{{ partial "PrepareHTML" $subtitle }}</p>
         </hgroup>
       {{- else -}}
         <h1>{{ partial "PrepareHTML" .title }}</h1>