diff --git a/layouts/partials/image.html b/layouts/partials/image.html
index 80e510b5..a6478e99 100644
--- a/layouts/partials/image.html
+++ b/layouts/partials/image.html
@@ -1,5 +1,5 @@
 <!-- prettier-ignore -->
-{{ if .caption }}
+{{- if or (or .title .caption) .attr -}}
   <figure>
 {{ end }}
 
@@ -90,7 +90,19 @@
 
 
 <!-- prettier-ignore -->
-{{ if .caption }}
-    <figcaption>{{ .page.RenderString .caption }}</figcaption>
-  </figure>
+{{- if or (or .title .caption) .attr -}}
+  <figcaption>
+    {{ with .title -}}
+        {{ . }}
+    {{- end -}}
+    {{- if or .caption .attr -}}<p>
+        {{- .caption | markdownify -}}
+        {{- with .attrlink }}
+            <a href="{{ . }}">
+        {{- end -}}
+        {{- .attr | markdownify -}}
+        {{- if .attrlink }}</a>{{ end }}</p>
+    {{- end }}
+  </figcaption>
+</figure>
 {{ end }}
\ No newline at end of file