diff --git a/app/helpers/admin/application_helper.rb b/app/helpers/admin/application_helper.rb
index 91f5526ed5ad01a928e9abddfc2dac25a2465ae8..b73956e656435e2ed339848b0bd4ed8372057ad5 100644
--- a/app/helpers/admin/application_helper.rb
+++ b/app/helpers/admin/application_helper.rb
@@ -60,9 +60,8 @@ module Admin::ApplicationHelper
                 form: form.options.dig(:html, :id)
   end
 
-  def prepare_for_github(html, university)
+  def prepare_html_for_static(html, university)
     text = html.to_s
-
     text = sanitize text,
                     tags: %w(table figure figcaption strong em b i u p code pre tt samp kbd var sub sup dfn cite big small address hr br span h1 h2 h3 h4 h5 h6 ul ol li dl dt dd abbr acronym a img blockquote del ins),
                     attributes: %w(rel  href src srcset width height alt cite datetime title class name xml:lang abbr style target)
@@ -72,6 +71,15 @@ module Admin::ApplicationHelper
     sanitize text
   end
 
+  def prepare_text_for_static(text)
+    # Beware, it works only at level one, with 2 spaces
+    indentation = '  '
+    text = strip_tags text.to_s
+    text.gsub! "\r\n", "\n" # Remove useless \r
+    text.gsub! "\n", "\n#{indentation}" # Indent properly to avoid broken frontmatter
+    text.chomp
+  end
+
   def collection_tree(list, except = nil)
     collection = []
     list.root.ordered.each do |object|
diff --git a/app/views/admin/communication/website/categories/static.html.erb b/app/views/admin/communication/website/categories/static.html.erb
index 9fe83ce6e974c099cfcef92959d5afff137c2aa0..88af1c3f3cf8adfd48978219c885024847cbb165 100644
--- a/app/views/admin/communication/website/categories/static.html.erb
+++ b/app/views/admin/communication/website/categories/static.html.erb
@@ -3,4 +3,4 @@ title: "<%= @category.name %>"
 slug: "<%= @category.slug %>"
 position: <%= @category.position %>
 ---
-<%= prepare_for_github @category.description, @category.university %>
+<%= prepare_html_for_static @category.description, @category.university %>
diff --git a/app/views/admin/communication/website/homes/static.html.erb b/app/views/admin/communication/website/homes/static.html.erb
index 61c67859ea9be2c07f951298a0e956f06e574009..40827fb2652597d30f61c2bd7e2e5d25ac228efa 100644
--- a/app/views/admin/communication/website/homes/static.html.erb
+++ b/app/views/admin/communication/website/homes/static.html.erb
@@ -7,6 +7,6 @@ image: "<%= @home.featured_image.blob.id %>"
 image_alt: "<%= @home.featured_image_alt %>"
 <% end %>
 description: >
-  <%= strip_tags(@home.text.to_s).chomp %>
+  <%= prepare_text_for_static @home.text %>
 ---
-<%= prepare_for_github @home.text, @home.university %>
+<%= prepare_html_for_static @home.text, @home.university %>
diff --git a/app/views/admin/communication/website/pages/static.html.erb b/app/views/admin/communication/website/pages/static.html.erb
index f228a27075a4a3c5d0a3a40d23e8d30f600d61eb..cc7f289eec0cf977cc1efa86c2ea189e895f4740 100644
--- a/app/views/admin/communication/website/pages/static.html.erb
+++ b/app/views/admin/communication/website/pages/static.html.erb
@@ -11,6 +11,6 @@ image_alt: "<%= @page.featured_image_alt %>"
 category: "<%= @page.related_category.path %>/"
 <% end %>
 description: >
-  <%= prepare_for_github @page.description, @page.university %>
+  <%= prepare_text_for_static @page.description %>
 ---
-<%= prepare_for_github @page.text, @page.university %>
+<%= prepare_html_for_static @page.text, @page.university %>
diff --git a/app/views/admin/communication/website/posts/static.html.erb b/app/views/admin/communication/website/posts/static.html.erb
index 7e1e119848cb879ee465597727c4097f04d42da2..0d88cc9d41f4186cc7308e1af952bedf8d58ec4a 100644
--- a/app/views/admin/communication/website/posts/static.html.erb
+++ b/app/views/admin/communication/website/posts/static.html.erb
@@ -20,6 +20,6 @@ image: "<%= @post.featured_image.blob.id %>"
 image_alt: "<%= @post.featured_image_alt %>"
 <% end %>
 description: >
-  <%= @post.description.chomp %>
+  <%= prepare_text_for_static @post.description %>
 ---
-<%= prepare_for_github @post.text, @post.university %>
+<%= prepare_html_for_static @post.text, @post.university %>
diff --git a/app/views/admin/education/programs/static.html.erb b/app/views/admin/education/programs/static.html.erb
index 393b09bbb103755fb7ef18da45524c6e434578b2..45cfd5d1e6e8b8c559070711ffdf005179425468 100644
--- a/app/views/admin/education/programs/static.html.erb
+++ b/app/views/admin/education/programs/static.html.erb
@@ -3,7 +3,7 @@ title: >
   <%= @program.name %>
 url: /<%= @website.programs_github_directory %><%= @program.path %>/
 description: >
-  <%= prepare_for_github @program.description, @program.university %>
+  <%= prepare_text_for_static @program.description %>
 position: <%= @program.position %>
 <% if @program.best_featured_image.attached? %>
 image: "<%= @program.best_featured_image.blob.id %>"
@@ -47,6 +47,6 @@ ects: <%= @program.ects %>
   :content
 ].each do |property| %>
 <%= property.to_s %>: >
-  <%= prepare_for_github @program.send("best_#{property}"), @program.university %>
+  <%= prepare_html_for_static @program.send("best_#{property}"), @program.university %>
 <% end %>
 ---
diff --git a/app/views/admin/research/journal/articles/static.html.erb b/app/views/admin/research/journal/articles/static.html.erb
index ebeb64a936066dc2bf1ccbc38477890391c5a698..5899fe017b2647ec5f8b59d5039709664f88fe22 100644
--- a/app/views/admin/research/journal/articles/static.html.erb
+++ b/app/views/admin/research/journal/articles/static.html.erb
@@ -1,7 +1,7 @@
 ---
 title: "<%= @article.title %>"
 description: >
-  <%= @article.abstract %>
+  <%= prepare_text_for_static @article.abstract %>
 <% if @article.volume && @article.volume.path %>
 volumes:
   - "<%= @article.volume.path %>"
diff --git a/app/views/admin/research/journals/static.html.erb b/app/views/admin/research/journals/static.html.erb
index d44e4ec185a045bc91b290be335075f1fe508f73..8c6ebc60c9d5ea3aa98285b1162111573f4b8eeb 100644
--- a/app/views/admin/research/journals/static.html.erb
+++ b/app/views/admin/research/journals/static.html.erb
@@ -2,7 +2,7 @@
 title: >
   <%= @journal.title %>
 description: >
-  <%= @journal.description %>
+  <%= prepare_text_for_static @journal.description %>
 issn: >
   <%= @journal.issn %>
 ---
diff --git a/app/views/admin/university/people/static.html.erb b/app/views/admin/university/people/static.html.erb
index a90dfeb621a774b90760b1c8ea2117b59118b96e..b50a047d6fc276bb22b78708c350c1e7b8fec720 100644
--- a/app/views/admin/university/people/static.html.erb
+++ b/app/views/admin/university/people/static.html.erb
@@ -23,4 +23,4 @@ roles:
   - administrator
 <% end %>
 ---
-<%= prepare_for_github @person.biography, @person.university %>
+<%= prepare_html_for_static @person.biography, @person.university %>