diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index f22064fe9..6b106f4c8 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -15,7 +15,7 @@
     {% include 'post/header' %}
     {% include 'post/intro-image' %}
 
-    <div class="markdown spaced-y-4 mb-6">
+    <div class="markup spaced-y-4 mb-6">
         {% include 'post/old-post-message' %}
         {% block content %}{% endblock %}
     </div>
diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig
index 50f78edc5..1f6d5467a 100644
--- a/source/_layouts/talk.html.twig
+++ b/source/_layouts/talk.html.twig
@@ -1,7 +1,7 @@
 {% extends 'default' %}
 
 {% block content_wrapper %}
-    <div class="markdown">
+    <div class="markup">
         {% block content %}{% endblock %}
     </div>
 
diff --git a/source/_partials/opensource/projects.html.twig b/source/_partials/opensource/projects.html.twig
index cde9ced1b..de73d7b05 100644
--- a/source/_partials/opensource/projects.html.twig
+++ b/source/_partials/opensource/projects.html.twig
@@ -8,7 +8,7 @@
                     </a>
                 </h3>
 
-                <div class="markdown flex-1">
+                <div class="markup flex-1">
                     {{ project.description }}
                 </div>
 
diff --git a/source/experience.html.twig b/source/experience.html.twig
index a9580298d..763f9dbd9 100644
--- a/source/experience.html.twig
+++ b/source/experience.html.twig
@@ -152,7 +152,7 @@ experiences:
                         </div>
 
                         {% if experience.description %}
-                            <div class="markdown">
+                            <div class="markup">
                                 {{ experience.description|markdown }}
                             </div>
                         {% endif %}
diff --git a/source/test-driven-drupal.md b/source/test-driven-drupal.md
index 54b37ea6a..1dff6a8c4 100644
--- a/source/test-driven-drupal.md
+++ b/source/test-driven-drupal.md
@@ -5,7 +5,7 @@ mailchimp_url: 'https://oliverdavi.us18.list-manage.com/subscribe/post?u=b4ac8dd
 contact_email: 'oliver@testdrivendrupal.com'
 ---
 {% block content %}
-<div class="markdown spaced-y-4 mb-6" markdown="1">
+<div class="markup spaced-y-4 mb-6" markup="1">
 Having [given talks][1] and workshops, been a guest on podcasts and [written blog posts][0] about automated testing in Drupal, I’m currently in the planning phase of a book and potentially some accompanying screencasts about it, focussing on Drupal 8.
 
 I’m still thinking about what use-cases to cover and examples to include, but here are some of the things I’m considering:
diff --git a/source/testimonials.html.twig b/source/testimonials.html.twig
index dde38bc0e..7d36626ab 100644
--- a/source/testimonials.html.twig
+++ b/source/testimonials.html.twig
@@ -91,7 +91,7 @@ testimonials:
                         {% endif %}
                     </div>
 
-                    <div class="markdown">
+                    <div class="markup">
                         {{ testimonial.text|markdown }}
                     </div>
                 </div>