diff --git a/_includes/site-feature.html b/_includes/site-feature.html
index be407ab70db3f90ad0c694fca4afc0c6cde38fac..41874b8d720c6a4e019131df0b52cf24491afc4d 100644
--- a/_includes/site-feature.html
+++ b/_includes/site-feature.html
@@ -1,6 +1,10 @@
 {% assign feature_text = page.feature_text %}
 {% assign feature_image = page.feature_image %}
 
+{% if feature_image == nil %}
+  {% assign feature_image = page.image %}
+{% endif %}
+
 {% if page.collectionpage %}
   {% assign collectiondata = site.collections | where: "label", page.collectionpage | first %}
   {% assign feature_text = collectiondata.feature_text %}
diff --git a/_includes/twittercard.html b/_includes/twittercard.html
index 648bb7c53edca2e073a6f58f89867f3b78b412ee..93908c87eb172ba275609f226d910b90f33a7bb8 100644
--- a/_includes/twittercard.html
+++ b/_includes/twittercard.html
@@ -8,7 +8,7 @@
 
 {% assign feature_image = page.feature_image %}
 
-{% if !feature_image %}
+{% if feature_image == nil %}
   {% assign feature_image = page.image %}
 {% endif %}
 
diff --git a/_media/2020-12-11-muonpi.md b/_media/2020-12-11-muonpi.md
index 59497e37a2aae92935247473ea8ee3222a138af9..320fd17d210528c5bf0ac72243fd4de7cc5fd11e 100644
--- a/_media/2020-12-11-muonpi.md
+++ b/_media/2020-12-11-muonpi.md
@@ -3,7 +3,7 @@ layout: [video]
 date:   2020-12-11 20:00:00 +0200
 title:  "MuonPi – Community-basierte verteilte Messung kosmischer Strahlung [Freitalk N8]"
 license:
-feature_image: "freitalk-muonpi-community-basierte-verteilte-messung-kosmischer-strahlung.jpg"
+image: "freitalk-muonpi-community-basierte-verteilte-messung-kosmischer-strahlung.jpg"
 #https://www.uuidgenerator.net/
 uid: 423e6715-f6ad-4332-af7b-07439bbe463d
 yt: "https://www.youtube.com/watch?v=2C2CkgMNC14"
diff --git a/_media/2022-01-15-i-like-p5.md b/_media/2022-01-15-i-like-p5.md
index b0b3475e4a9d225876c19e97b7dd4bb88a9b8b54..d667bd88f09932cb1b8d01625c02910acbb57d9f 100644
--- a/_media/2022-01-15-i-like-p5.md
+++ b/_media/2022-01-15-i-like-p5.md
@@ -3,7 +3,7 @@ layout: [video]
 date:   2023-01-15 19:00:00 +0200
 title:  "Fabi likes P5"
 license: CC-BY-NC-ND-40
-feature_image: "https://video.chaotikum.net/5min/2022-12-29/2022-12-29-5min-i-like-p5.png"
+image: "https://video.chaotikum.net/5min/2022-12-29/2022-12-29-5min-i-like-p5.png"
 #https://www.uuidgenerator.net/
 uid: 67dbaaf2-a392-40da-985f-3f2750326bde
 yt: "https://www.youtube.com/watch?v=6AJwHBxa6jo"
diff --git a/_media/2023-01-07-linux-user-namespaces-und-der-unshare-befehl.md b/_media/2023-01-07-linux-user-namespaces-und-der-unshare-befehl.md
index 11129411cae5f2288c2ca2bfe6e5b09cd97a177a..5da54c9441824a94ee4f44e4007ff272cfbf05da 100644
--- a/_media/2023-01-07-linux-user-namespaces-und-der-unshare-befehl.md
+++ b/_media/2023-01-07-linux-user-namespaces-und-der-unshare-befehl.md
@@ -3,7 +3,7 @@ layout: [video]
 date:   2023-01-07 19:00:00 +0200
 title:  "NeoRaider über Linux User-Namespaces und den unshare-Befehl"
 license: CC-BY-NC-ND-40
-feature_image: "https://video.chaotikum.net/5min/2022-12-29/2022-12-29-5min-linux-user-namespaces.png"
+image: "https://video.chaotikum.net/5min/2022-12-29/2022-12-29-5min-linux-user-namespaces.png"
 #https://www.uuidgenerator.net/
 uid: 1fc7db56-5c9d-452b-ad51-b43894f77c42
 yt: "https://www.youtube.com/watch?v=zE07kstdvzc"
diff --git a/_media/2023-01-08-nook22.md b/_media/2023-01-08-nook22.md
index a49dcdda66c31d4293cb001f2eb8071d42c2547f..e321c7a7deb17afb95e0a4413c4424d09e4cc463 100644
--- a/_media/2023-01-08-nook22.md
+++ b/_media/2023-01-08-nook22.md
@@ -3,7 +3,7 @@ layout: [video]
 date:   2023-01-08 19:00:00 +0200
 title:  "TVLuke über die Zahlen, Daten, Fakten der NooK 2022"
 license: CC-BY-NC-ND-40
-feature_image: "https://video.chaotikum.net/5min/2022-12-29/2022-12-29-5min-nook2022.png"
+image: "https://video.chaotikum.net/5min/2022-12-29/2022-12-29-5min-nook2022.png"
 #https://www.uuidgenerator.net/
 uid: 5c5cc720-c18e-414e-a069-7acaa030c88b
 yt: "https://www.youtube.com/watch?v=KA9-07DPPjg"
diff --git a/_media/2023-01-14-simon-tathams-portable-puzzle-collection-und-loopy.md b/_media/2023-01-14-simon-tathams-portable-puzzle-collection-und-loopy.md
index c368fa526c37e76f09fbc2ed41eb230f9be3fa6f..42167b9d993702d8fac1a939120043d3b6ec6f5b 100644
--- a/_media/2023-01-14-simon-tathams-portable-puzzle-collection-und-loopy.md
+++ b/_media/2023-01-14-simon-tathams-portable-puzzle-collection-und-loopy.md
@@ -3,7 +3,7 @@ layout: [video]
 date:   2023-01-14 19:00:00 +0200
 title:  "Jakob über Simon Tatham's Portable Puzzle Collection und Loopy"
 license: CC-BY-NC-ND-40
-feature_image: "https://video.chaotikum.net/5min/2022-12-29/2022-12-29-5min-simon-tathams-portable-puzzle-collection-und-loopy.png"
+image: "https://video.chaotikum.net/5min/2022-12-29/2022-12-29-5min-simon-tathams-portable-puzzle-collection-und-loopy.png"
 #https://www.uuidgenerator.net/
 uid: c7f1466b-3445-4d44-bae4-49cb0706e7be
 yt: "https://www.youtube.com/watch?v=IP4MIEZvkmg"