diff --git a/src/category.pug b/src/category.pug
index 562efeaa05e..5ef6502a1c2 100644
--- a/src/category.pug
+++ b/src/category.pug
@@ -9,6 +9,7 @@ block vars
 block main
   #podcast.podcast-category.wrap
     section
+      h1= site.meta.title
       p= description
       +categories(categoryName)
 
diff --git a/src/css/sections/podcast.css b/src/css/sections/podcast.css
index 4903001cec2..0a2946e7c40 100644
--- a/src/css/sections/podcast.css
+++ b/src/css/sections/podcast.css
@@ -1,17 +1,9 @@
 #podcast {
-  &.podcast-home h1 {
-    display: none;
-  }
-
-  &.podcast-category h1 {
-    margin-top: var(--space-l);
-  }
-
   & .categories {
     display: inline-flex;
     flex-wrap: wrap;
     list-style: none;
-    margin: 0 0 var(--space-l) 0;
+    margin: var(--space-l) 0 var(--space-xl);
 
     & li {
       margin: 0 var(--space-m) var(--space-m) 0;
diff --git a/src/includes/template.pug b/src/includes/template.pug
index 7a8565f9daf..3e23342a604 100644
--- a/src/includes/template.pug
+++ b/src/includes/template.pug
@@ -2,7 +2,7 @@ include mixins
 
 block vars
 
-- const pageTitle = title ? `${title} · ${site.meta.title}` : site.meta.title
+- const pageTitle = title && title !== site.meta.title ? `${title} · ${site.meta.title}` : site.meta.title
 - const pageDescription = description || site.meta.description
 - const pageKeywords = keywords || site.meta.keywords
 - const pageCard = cardImage || site.meta.cardImage
diff --git a/src/index.pug b/src/index.pug
index 41d34de895b..664a4dd0402 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -1,5 +1,9 @@
 extends /template.pug
 
+block vars
+  - const title = site.meta.title
+  - const description = site.meta.description
+
 block main
   - const ticker = shuffle(site.meta.ticker).join(" +++ ") + " +++ "
   - const duration = ticker.length / 4
@@ -9,11 +13,10 @@ block main
 
   .wrap
     section
+      h1= title
+      h2= description
+
       :markdown-it(html linkify typographer)
-        # Einundzwanzig, der Bitcoin Podcast
-
-        ## Toximalistisches Infotainment für bullishe Bitcoiner
-
         [Bitcoin](https://bitcoin.org/bitcoin.pdf), und sonst nichts.
         Einmal die Woche sitzen die Jungs zusammen und besprechen die aktuellen Geschehnisse in Bitcoin und der Welt.
 
diff --git a/src/podcast.pug b/src/podcast.pug
index c7ee9804606..c44e8804592 100644
--- a/src/podcast.pug
+++ b/src/podcast.pug
@@ -2,7 +2,7 @@ extends /template.pug
 
 block vars
   - const current = episodes.shift()
-  - const title = 'Podcast'
+  - const title = site.meta.title
   - const description = 'Wir bringen dir die Bitcoin-News der Woche, sowie zusätzlich Interviews und die besten Artikel als Lesestunde. Außerdem erfährst du in "Der Weg" wie andere Leute zu Bitcoin gekommen sind.'
 
 block main