diff --git a/content/about-us/index.de.md b/content/about-us/index.de.md
index 9d63f5b7..84266f7a 100644
--- a/content/about-us/index.de.md
+++ b/content/about-us/index.de.md
@@ -6,7 +6,7 @@ description: "Lerne das Team hinter der FIP Guide Website kennen und entdecke, w
 {{% float-image
     src="image.webp"
     alt="Das FIP Guide Team"
-    caption="Das FIP Guide Team von links nach rechts: Robert Schuster, Lennart Rommeiß, Moritz Weber, Willy Schreiter. 📸 Toni Arndt"
+    caption="Das FIP Guide Team von links nach rechts: Robert Schuster, Lennart Rommeiß, Moritz Weber und Willy Schreiter. <br> 📸 Toni Arndt"
     width="50%"
     position="right"
 %}}
diff --git a/content/about-us/index.en.md b/content/about-us/index.en.md
index 3cb0616f..3a841ef7 100644
--- a/content/about-us/index.en.md
+++ b/content/about-us/index.en.md
@@ -6,7 +6,7 @@ description: "Get to know the team behind the FIP Guide website and discover why
 {{% float-image
     src="image.webp"
     alt="The FIP Guide core team"
-    caption="The FIP Guide core team from left to right: Robert Schuster, Lennart Rommeiß, Moritz Weber, Willy Schreiter. 📸 Toni Arndt"
+    caption="The FIP Guide team from left to right: Robert Schuster, Lennart Rommeiß, Moritz Weber and Willy Schreiter. <br> 📸 Toni Arndt"
     width="50%"
     position="right"
 %}}
diff --git a/content/about-us/index.fr.md b/content/about-us/index.fr.md
index e6345373..9d3f5453 100644
--- a/content/about-us/index.fr.md
+++ b/content/about-us/index.fr.md
@@ -6,7 +6,7 @@ description: "Faites connaissance avec l'équipe derrière le site web FIP Guide
 {{% float-image
     src="image.webp"
     alt="L'équipe principale du guide FIP"
-    caption="L'équipe principale du guide FIP de gauche à droite : Robert Schuster, Lennart Rommeiß, Moritz Weber, Willy Schreiter. 📸 Toni Arndt"
+    caption="L'équipe FIP Guide de gauche à droite : Robert Schuster, Lennart Rommeiß, Moritz Weber et Willy Schreiter. <br> 📸 Toni Arndt"
     width="50%"
     position="right"
 %}}
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index 86cbd626..6e366fd7 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -31,7 +31,7 @@
         loading="lazy"
       />
     {{- else -}}
-      {{- partial "image" (dict "image" $image "caption" .PlainText) -}}
+      {{- partial "image" (dict "image" $image "caption" .PlainText "Page" .Page) -}}
     {{- end -}}
   {{- else -}}
     {{- warnf "Image resource '%s' could not be found. Used in '%s'" .Destination $.Page.File.Path -}}
diff --git a/layouts/partials/image.html b/layouts/partials/image.html
index e2cb2a30..dcfea755 100644
--- a/layouts/partials/image.html
+++ b/layouts/partials/image.html
@@ -61,7 +61,7 @@
   {{- if .caption -}}
     <hr aria-hidden="true" />
     <figcaption>
-      {{ .caption }}
+      {{- .caption | .Page.RenderString -}}
     </figcaption>
   {{- end -}}
 </figure>
diff --git a/layouts/shortcodes/float-image.html b/layouts/shortcodes/float-image.html
index 31e12570..c8093872 100644
--- a/layouts/shortcodes/float-image.html
+++ b/layouts/shortcodes/float-image.html
@@ -12,6 +12,7 @@
     "alt" $alt
     "caption" $caption
     "width" $width
+    "Page" .Page
     )
   -}}
   <div class="m-float-image__content">