diff --git a/_includes/site-header.html b/_includes/site-header.html
index a6a9d443cc367f8ef8155a03750bb51f68346dec..9d5132253d077e80d2615dc3a899f41349902c45 100644
--- a/_includes/site-header.html
+++ b/_includes/site-header.html
@@ -22,6 +22,10 @@
     {% include site-feature.html %}
   {% endif %}
 
+  {% if page.layout == "video" -%}
+    {% capture feature_image %}https://video.chaotikum.net/thumbnails/{{page.name}}.png{% endcapture -%}
+  {% endif -%}
+
 <div class="statusmobile" style="width: 80%; margin:0 auto; margin-top: -45px; background-color: #FAFAFA;">
   {% include space-status-mobile.html %}
 </div>
diff --git a/_includes/twittercard.html b/_includes/twittercard.html
index 93908c87eb172ba275609f226d910b90f33a7bb8..42a33b36193cc356419e8db1d000258843b2f1b5 100644
--- a/_includes/twittercard.html
+++ b/_includes/twittercard.html
@@ -12,6 +12,11 @@
   {% assign feature_image = page.image %}
 {% endif %}
 
+  {% if page.layout == "video" -%}
+    {%- assign realslug = page.url | split:'/' | last -%}
+    {% capture feature_image %}https://video.chaotikum.net/thumbnails/{{realslug}}.jpg{% endcapture -%}
+  {% endif -%}
+
 {% if feature_image %}
   {% if feature_image contains '://' %}
     <meta name="twitter:image" content="{{feature_image}}">
diff --git a/_layouts/video.html b/_layouts/video.html
index 8392cf7d19fe690f4818cf053a8edcad5ed3879a..c527eb7e93741d8946a2f4758f6fc3f63a20455d 100644
--- a/_layouts/video.html
+++ b/_layouts/video.html
@@ -33,20 +33,12 @@ layout: default
 
     <article class="article  article--page  typeset">
 
-	    
+    {%- assign realslug = page.url | split:'/' | last -%}
     	<div style="width: 100%; 
     		display: flex;
     		background-color:#eeeeee;
     		justify-content: center;">
-	    	{% if page.image != nil %}
-	    		{% if page.image contains '://' %}
-	    			<img src="{{ page.image }}" alt="" style="margin: 0 auto;">
-	    	 	{% else %}
-					<img src="{{ site.baseurl }}/images/thumbnails/video/{{ page.image }}" alt="" style="margin: 0 auto;">
-				{% endif %}
-	    	{% else %}
-				<img src="{{ site.baseurl }}/images/thumbnails/video/default.jpg" alt="" style="margin: 0 auto;">
-	    	{% endif %}
+	    	<img src="https://video.chaotikum.net/thumbnails/{{ realslug }}.jpg" alt="" style="margin: 0 auto;">
 	    </div>
 		<h4 style="text-align: center; background-color:#eeeeee; color:000000">{{ title }}</h4>
 	    {% capture release_date %}{{page.release_date | date: '%s'}}{% endcapture -%}